1、办事指南调整

2、我的承办初始化

src/main/java/com/xjrsoft/module/oa/controller/MessageController.java

@@ -25,7 +25,12 @@ import com.xjrsoft.module.organization.dto.ResetPasswordDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.Duration;
 import java.time.LocalDateTime;

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -18,7 +18,14 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddNewsDto;
+import com.xjrsoft.module.oa.dto.ChangeNewsDto;
+import com.xjrsoft.module.oa.dto.DeleteNewsRelationDto;
+import com.xjrsoft.module.oa.dto.NewsPageDto;
+import com.xjrsoft.module.oa.dto.NewsRelationPageDto;
+import com.xjrsoft.module.oa.dto.NewsReplyDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsRelationDto;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.entity.NewsAppendix;
 import com.xjrsoft.module.oa.entity.NewsRelation;
@@ -27,7 +34,12 @@ import com.xjrsoft.module.oa.service.INewsAppendixService;
 import com.xjrsoft.module.oa.service.INewsRelationConfigService;
 import com.xjrsoft.module.oa.service.INewsRelationService;
 import com.xjrsoft.module.oa.service.INewsService;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.NewsAppendixVo;
+import com.xjrsoft.module.oa.vo.NewsCountTypeVo;
+import com.xjrsoft.module.oa.vo.NewsPageVo;
+import com.xjrsoft.module.oa.vo.NewsRelationConfigVo;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
+import com.xjrsoft.module.oa.vo.NewsVo;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.mapper.DepartmentMapper;
 import com.xjrsoft.module.system.entity.File;
@@ -40,7 +52,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentPostController.java

@@ -19,7 +19,14 @@ import com.xjrsoft.module.oa.vo.OfficialDocumentPostVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedController.java

@@ -19,7 +19,14 @@ import com.xjrsoft.module.oa.vo.OfficialDocumentReceivedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/com/xjrsoft/module/oa/controller/ProclamationController.java

@@ -13,19 +13,38 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddProclamationDto;
+import com.xjrsoft.module.oa.dto.ChangeNewsDto;
+import com.xjrsoft.module.oa.dto.DeleteNewsRelationDto;
+import com.xjrsoft.module.oa.dto.NewsRelationPageDto;
+import com.xjrsoft.module.oa.dto.NewsReplyDto;
+import com.xjrsoft.module.oa.dto.ProclamationPageDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsRelationDto;
+import com.xjrsoft.module.oa.dto.UpdateProclamationDto;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.entity.NewsRelation;
 import com.xjrsoft.module.oa.entity.NewsRelationConfig;
 import com.xjrsoft.module.oa.service.INewsRelationConfigService;
 import com.xjrsoft.module.oa.service.INewsRelationService;
 import com.xjrsoft.module.oa.service.INewsService;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.NewsCountTypeVo;
+import com.xjrsoft.module.oa.vo.NewsGradeClassTreeVo;
+import com.xjrsoft.module.oa.vo.NewsRelationConfigVo;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
+import com.xjrsoft.module.oa.vo.ProclamationPageVo;
+import com.xjrsoft.module.oa.vo.ProclamationVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;

src/main/java/com/xjrsoft/module/oa/controller/ScheduleController.java

@@ -16,7 +16,14 @@ import com.xjrsoft.module.oa.vo.ScheduleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/xjrsoft/module/oa/controller/WfMeetingApplyController.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.oa.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.annotation.XjrLog;
@@ -10,17 +9,42 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.QrCodeUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddMeetingConfereeOpinionDto;
+import com.xjrsoft.module.oa.dto.HistoryMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeListDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeOpinionListDto;
+import com.xjrsoft.module.oa.dto.MeetingRoomListDto;
+import com.xjrsoft.module.oa.dto.SponsorMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.TodayMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.UpdateMeetingCheckInDto;
+import com.xjrsoft.module.oa.dto.UpdateMeetingSummaryDto;
+import com.xjrsoft.module.oa.dto.UpdateRevocationMeetingDto;
+import com.xjrsoft.module.oa.dto.WfMeetingApplyPageDto;
 import com.xjrsoft.module.oa.entity.WfMeetingApply;
 import com.xjrsoft.module.oa.service.IWfMeetingApplyService;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.HistoryMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeListVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeOpinionListVo;
+import com.xjrsoft.module.oa.vo.MeetingMobileInfoVo;
+import com.xjrsoft.module.oa.vo.MeetingRoomListVo;
+import com.xjrsoft.module.oa.vo.MeetingSummaryVo;
+import com.xjrsoft.module.oa.vo.SponsorMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.TodayMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyInWorkflowVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyPageVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/com/xjrsoft/module/oa/dto/AddMeetingConfereeOpinionDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.oa.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/oa/dto/MeetingConfereeListDto.java

@@ -2,9 +2,6 @@ package com.xjrsoft.module.oa.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
 
 /**
 * @title: 会议参会人员列表(不分页)入参

src/main/java/com/xjrsoft/module/oa/dto/MeetingRoomListDto.java

@@ -1,13 +1,7 @@
 package com.xjrsoft.module.oa.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 
 /**
 * @title: 会议室列表(不分页)入参

src/main/java/com/xjrsoft/module/oa/dto/TodayMeetingMobilePageDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/xjrsoft/module/oa/dto/WfMeetingApplyPageDto.java

@@ -7,10 +7,6 @@ import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/oa/entity/MeetingConferee.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/oa/entity/MeetingConfereeOpinion.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/oa/entity/MeetingRoom.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/oa/entity/OfficialDocumentPost.java

@@ -1,6 +1,10 @@
 package com.xjrsoft.module.oa.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/xjrsoft/module/oa/entity/OfficialDocumentReceived.java

@@ -1,11 +1,16 @@
 package com.xjrsoft.module.oa.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -122,4 +127,17 @@ public class OfficialDocumentReceived implements Serializable {
     private Long fileId;
 
 
+    @ApiModelProperty("是否已落实")
+    private Integer isHandle;
+
+    @ApiModelProperty("落实时间")
+    private LocalDateTime handleTime;
+
+    @ApiModelProperty("落实人")
+    private Long handleUserId;
+
+    @ApiModelProperty("落实负责人")
+    private Long handleDutyUserId;
+
+
 }

src/main/java/com/xjrsoft/module/oa/mapper/MeetingConfereeMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.oa.entity.MeetingConferee;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/oa/mapper/MeetingConfereeOpinionMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.oa.entity.MeetingConfereeOpinion;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/oa/mapper/MeetingRoomMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.oa.entity.MeetingRoom;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/oa/mapper/NewsRelationMapper.java

@@ -18,6 +18,20 @@ public interface NewsRelationMapper extends MPJBaseMapper<NewsRelation> {
      */
     Boolean insertAllTeaStaff(@Param("newsId") Long newsId);
 
+    /**
+     * 添加所有家长
+     * @param newsId
+     * @return
+     */
+    Boolean insertAllParentsStaff(@Param("newsId") Long newsId);
+
+    /**
+     * 添加所有学生
+     * @param newsId
+     * @return
+     */
+    Boolean insertAllStudentStaff(@Param("newsId") Long newsId);
+
     /**
      * 添加部门下面的人
      *

src/main/java/com/xjrsoft/module/oa/mapper/WfMeetingApplyMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.oa.entity.WfMeetingApply;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/oa/service/INewsService.java

@@ -2,7 +2,15 @@ package com.xjrsoft.module.oa.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddNewsDto;
+import com.xjrsoft.module.oa.dto.AddProclamationDto;
+import com.xjrsoft.module.oa.dto.ChangeNewsDto;
+import com.xjrsoft.module.oa.dto.DeleteNewsRelationDto;
+import com.xjrsoft.module.oa.dto.NewsPageDto;
+import com.xjrsoft.module.oa.dto.ProclamationPageDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsRelationDto;
+import com.xjrsoft.module.oa.dto.UpdateProclamationDto;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.vo.NewsGradeClassTreeVo;
 import com.xjrsoft.module.oa.vo.NewsPageVo;

src/main/java/com/xjrsoft/module/oa/service/IWfMeetingApplyService.java

@@ -2,9 +2,26 @@ package com.xjrsoft.module.oa.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddMeetingConfereeOpinionDto;
+import com.xjrsoft.module.oa.dto.HistoryMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeListDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeOpinionListDto;
+import com.xjrsoft.module.oa.dto.MeetingRoomListDto;
+import com.xjrsoft.module.oa.dto.SponsorMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.TodayMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.UpdateMeetingCheckInDto;
+import com.xjrsoft.module.oa.dto.UpdateRevocationMeetingDto;
+import com.xjrsoft.module.oa.dto.WfMeetingApplyPageDto;
 import com.xjrsoft.module.oa.entity.WfMeetingApply;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.HistoryMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeListVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeOpinionListVo;
+import com.xjrsoft.module.oa.vo.MeetingMobileInfoVo;
+import com.xjrsoft.module.oa.vo.MeetingRoomListVo;
+import com.xjrsoft.module.oa.vo.SponsorMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.TodayMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyInWorkflowVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyPageVo;
 
 import java.util.List;
 

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -22,7 +22,18 @@ import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.base.mapper.BaseGradeMapper;
-import com.xjrsoft.module.oa.dto.*;
+import com.xjrsoft.module.oa.dto.AddNewsAppendixDto;
+import com.xjrsoft.module.oa.dto.AddNewsDto;
+import com.xjrsoft.module.oa.dto.AddNewsRelationDto;
+import com.xjrsoft.module.oa.dto.AddProclamationDto;
+import com.xjrsoft.module.oa.dto.ChangeNewsDto;
+import com.xjrsoft.module.oa.dto.DeleteNewsRelationDto;
+import com.xjrsoft.module.oa.dto.NewsPageDto;
+import com.xjrsoft.module.oa.dto.NewsRelationConfigDto;
+import com.xjrsoft.module.oa.dto.ProclamationPageDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsRelationDto;
+import com.xjrsoft.module.oa.dto.UpdateProclamationDto;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.entity.NewsAppendix;
 import com.xjrsoft.module.oa.entity.NewsRelation;
@@ -34,7 +45,14 @@ import com.xjrsoft.module.oa.mapper.NewsRelationMapper;
 import com.xjrsoft.module.oa.service.INewsAppendixService;
 import com.xjrsoft.module.oa.service.INewsRelationService;
 import com.xjrsoft.module.oa.service.INewsService;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.DeptIdOrClassIdVo;
+import com.xjrsoft.module.oa.vo.NewsAppendixVo;
+import com.xjrsoft.module.oa.vo.NewsGradeClassTreeVo;
+import com.xjrsoft.module.oa.vo.NewsPageVo;
+import com.xjrsoft.module.oa.vo.NewsRelationConfigVo;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
+import com.xjrsoft.module.oa.vo.ProclamationPageVo;
+import com.xjrsoft.module.oa.vo.ProclamationVo;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.User;
@@ -504,6 +522,17 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         return true;
     }
 
+    private Boolean addRelationByGuideShowRange(News xjrNews) {
+        if (xjrNews.getGuideShowRange().contains("2")) {
+            newsRelationMapper.insertAllTeaStaff(xjrNews.getId());
+        } else if (xjrNews.getGuideShowRange().contains("3")) {
+            newsRelationMapper.insertAllStudentStaff(xjrNews.getId());
+        } else if(xjrNews.getGuideShowRange().contains("4")){
+            newsRelationMapper.insertAllParentsStaff(xjrNews.getId());
+        }
+        return true;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(AddNewsDto addNewsDto) {
@@ -527,7 +556,12 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
         //公告需要添加阅读关系，发送范围 1=全校教职工 2=全校师生 3=指定人员
         //1=全校教职工,添加全校教职工到关系表
-        addRelation(news, BeanUtil.toBean(addNewsDto, AddProclamationDto.class), 1);
+        if(news.getTypeId() != null && news.getTypeId() == 3){
+            addRelationByGuideShowRange(news);
+        }else{
+            addRelation(news, BeanUtil.toBean(addNewsDto, AddProclamationDto.class), 1);
+        }
+
         //添加新闻和公告的时候，如果状态是2，表示新闻和公告实时发布了，张贴开始时间就应该是发布时间需要发送消息
         if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2 && addNewsDto.getTypeId() != 3) {
             SendMessage(news.getId());

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -14,25 +14,42 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.MeetingTypeEnum;
 import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.base.entity.BaseOfficeBuild;
 import com.xjrsoft.module.ledger.vo.WorkflowRecordVo;
-import com.xjrsoft.module.oa.dto.*;
-import com.xjrsoft.module.oa.entity.*;
+import com.xjrsoft.module.oa.dto.AddMeetingConfereeOpinionDto;
+import com.xjrsoft.module.oa.dto.HistoryMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeListDto;
+import com.xjrsoft.module.oa.dto.MeetingConfereeOpinionListDto;
+import com.xjrsoft.module.oa.dto.MeetingRoomListDto;
+import com.xjrsoft.module.oa.dto.SponsorMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.TodayMeetingMobilePageDto;
+import com.xjrsoft.module.oa.dto.UpdateMeetingCheckInDto;
+import com.xjrsoft.module.oa.dto.UpdateRevocationMeetingDto;
+import com.xjrsoft.module.oa.dto.WfMeetingApplyPageDto;
+import com.xjrsoft.module.oa.entity.MeetingConferee;
+import com.xjrsoft.module.oa.entity.MeetingConfereeOpinion;
+import com.xjrsoft.module.oa.entity.MeetingRoom;
+import com.xjrsoft.module.oa.entity.WfMeetingApply;
 import com.xjrsoft.module.oa.mapper.MeetingConfereeMapper;
 import com.xjrsoft.module.oa.mapper.MeetingConfereeOpinionMapper;
 import com.xjrsoft.module.oa.mapper.MeetingRoomMapper;
 import com.xjrsoft.module.oa.mapper.WfMeetingApplyMapper;
 import com.xjrsoft.module.oa.service.IWfMeetingApplyService;
-import com.xjrsoft.module.oa.vo.*;
+import com.xjrsoft.module.oa.vo.HistoryMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeListVo;
+import com.xjrsoft.module.oa.vo.MeetingConfereeOpinionListVo;
+import com.xjrsoft.module.oa.vo.MeetingMobileInfoVo;
+import com.xjrsoft.module.oa.vo.MeetingRoomListVo;
+import com.xjrsoft.module.oa.vo.SponsorMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.TodayMeetingMobilePageVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyInWorkflowVo;
+import com.xjrsoft.module.oa.vo.WfMeetingApplyPageVo;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.organization.service.IWeChatService;
-import com.xjrsoft.module.schedule.vo.TodayScheduleVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.mapper.FileMapper;
@@ -56,7 +73,13 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/module/oa/service/impl/WfSubscriptionServiceImpl.java

@@ -9,7 +9,11 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
-import com.xjrsoft.module.ledger.vo.*;
+import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
+import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
+import com.xjrsoft.module.ledger.vo.WfSubscriptionListVo;
+import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
+import com.xjrsoft.module.ledger.vo.WorkflowRecordVo;
 import com.xjrsoft.module.oa.entity.WfSubscription;
 import com.xjrsoft.module.oa.entity.WfSubscriptionList;
 import com.xjrsoft.module.oa.mapper.WfSubscriptionListMapper;
@@ -30,7 +34,12 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/module/oa/vo/MeetingConfereeOpinionListVo.java

@@ -1,12 +1,9 @@
 package com.xjrsoft.module.oa.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
 * @title: 会议参会人员意见表单出参

src/main/java/com/xjrsoft/module/oa/vo/MeetingMobileInfoVo.java

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/oa/vo/MeetingRoomListVo.java

@@ -3,9 +3,6 @@ package com.xjrsoft.module.oa.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
 /**
 * @title: 会议室列表(不分页)出参
 * @Author phoenix

src/main/java/com/xjrsoft/module/oa/vo/TodayMeetingMobilePageVo.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.oa.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalTime;
 
 /**

src/main/resources/mapper/oa/NewsRelationMapper.xml

@@ -17,6 +17,33 @@
              where t.delete_mark = 0 and t4.id = 2)
     </insert>
 
+    <insert id="insertAllStudentStaff" parameterType="java.lang.Long">
+        insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
+            (select
+                 UUID(),
+                 #{newsId},
+                 t.id,
+                 NOW(),
+                 0
+             from xjr_user t
+                      left join xjr_user_role_relation t3 on t3.user_id = t.id
+                      LEFT JOIN xjr_role t4 ON t4.id = t3.role_id
+             where t.delete_mark = 0 and t4.id = 3)
+    </insert>
+    <insert id="insertAllStudentStaff" parameterType="java.lang.Long">
+        insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
+            (select
+                 UUID(),
+                 #{newsId},
+                 t.id,
+                 NOW(),
+                 0
+             from xjr_user t
+                      left join xjr_user_role_relation t3 on t3.user_id = t.id
+                      LEFT JOIN xjr_role t4 ON t4.id = t3.role_id
+             where t.delete_mark = 0 and t4.id = 4)
+    </insert>
+
     <insert id="insertDeptUser">
         insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
         (select

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.oa.mapper.OfficialDocumentReceivedMapper">
+    <select id="getPage" resultType="com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto" parameterType="com.xjrsoft.module.oa.vo.OfficialDocumentReceivedHandlePageVo">
+        SELECT DISTINCT t1.id, t6.name AS received_type_cn, t1.received_title,t1.received_number,
+        t1.received_date,t1.communication_org,t1.communication_number,t3.name AS handle_duty_user_name,
+        REPLACE((
+        SELECT GROUP_CONCAT(c2.name) FROM official_document_received_handle c1
+        INNER JOIN xjr_user c2 ON c1.receive_user_id = c2.id
+        WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id
+        ),',', '>') AS receive_user_name,t1.is_handle,t4.handle_user_name,t1.handle_time FROM official_document_received t1
+        INNER JOIN xjr_workflow_form_relation t2 ON t1.id =  CAST(t2.form_key_value AS SIGNED)
+        LEFT JOIN xjr_user t3 ON t1.handle_duty_user_id = t3.id
+        LEFT JOIN xjr_user t4 ON t1.handle_user_id = t4.id
+        LEFT JOIN official_document_received_handle t5 ON t1.id = t5.official_document_received_id
+        LEFT JOIN xjr_dictionary_detail t6 ON t1.received_type = t6.code
+        WHERE t2.current_state = 'COMPLETED'
+        AND t1.delete_mark = 0
+        AND t5.delete_mark = 0
+        <if test="dto.handleUserName != null and dto.handleUserName != ''">
+            AND t4.name like concat('%', #{dto.handleUserName},'%')
+        </if>
+        <if test="dto.handleDutyUserName != null and dto.handleDutyUserName != ''">
+            AND t3.name like concat('%', #{dto.handleDutyUserName},'%')
+        </if>
+        <if test="dto.handleDutyUserName != null and dto.handleDutyUserName != ''">
+            AND t3.name like concat('%', #{dto.handleDutyUserName},'%')
+        </if>
+        order by t1.id desc
+    </select>
+
+</mapper>

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -4703,4 +4703,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcoFficialDocumentPostHand() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("official_document_received_handle");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("oa");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }