update

src/main/java/com/ydool/boot/api/controller/ApiReviewSubjectController.java

@@ -51,7 +51,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "当前页"),
             @ApiImplicitParam(name = "size", value = "显示条数"),
-            @ApiImplicitParam(name = "type", value = "类型 1专题询问  2专项评议 "),
+//            @ApiImplicitParam(name = "type", value = "类型 1专题询问  2专项评议 "),
             @ApiImplicitParam(name = "reviewSubject", value = "评议主题"),
             @ApiImplicitParam(name = "platform", value = "当前登录的是哪个端    admin机关办公/ rddb代表/ voter选民  ", required = true)
     })
@@ -60,10 +60,12 @@ public class ApiReviewSubjectController extends ApiBaseController {
     })
     @ApiOperation("评议列表 (被指定的人与创建人可见)")
     @GetMapping
-    public void reviewPage(String type,String reviewSubject,String platform) {
+    public void reviewPage(
+//            String type,
+                           String reviewSubject,String platform) {
         Assert.notNull(platform, "请填入当前端参数");
         QueryWrapper<ReviewSubject> qw = new QueryWrapper<ReviewSubject>()
-                .eq("type", type)
+//                .eq("type", type)
                 .lt("state", ReviewSubject.STATE_PUBLIC)
                 .like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
 //                .and(_qw -> _qw
@@ -85,7 +87,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "当前页"),
             @ApiImplicitParam(name = "size", value = "显示条数"),
-            @ApiImplicitParam(name = "type", value = "类型 1专题询问  2专项评议 "),
+//            @ApiImplicitParam(name = "type", value = "类型 1专题询问  2专项评议 "),
             @ApiImplicitParam(name = "reviewSubject", value = "评议主题"),
             @ApiImplicitParam(name = "platform", value = "当前登录的是哪个端    admin机关办公/ rddb代表/ voter选民  ", required = true)
     })
@@ -94,10 +96,12 @@ public class ApiReviewSubjectController extends ApiBaseController {
     })
     @ApiOperation("公告栏 (所有人可见)")
     @GetMapping("public")
-    public void publicPage(String type,String reviewSubject,String platform) {
+    public void publicPage(
+//            String type,
+            String reviewSubject,String platform) {
         Assert.notNull(platform, "请填入当前端参数");
         QueryWrapper<ReviewSubject> qw = new QueryWrapper<ReviewSubject>()
-                .eq("type", type)
+//                .eq("type", type)
                 .eq("state", ReviewSubject.STATE_PUBLIC)
                 .like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
                 .orderByDesc("created_at");
@@ -152,7 +156,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
         render(Ret.ok().paged(paged));
     }
 
-    @ApiOperation("内部上报环节")
+    @ApiOperation("询问启动")
     @PostMapping("state/in_report")
     @ResponseBody
     @DynamicResponseParameters(properties = {
@@ -171,7 +175,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
         render(ret);
     }
 
-    @ApiOperation("上传自查/调查报告环节")
+    @ApiOperation("调查研究")
     @PostMapping("state/check")
     @ResponseBody
     @DynamicResponseParameters(properties = {
@@ -199,7 +203,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
         render(ret);
     }
 
-    @ApiOperation("上传评议意见环节")
+    @ApiOperation("专题询问")
     @PostMapping("state/opinion")
     @ResponseBody
     @DynamicResponseParameters(properties = {
@@ -210,7 +214,7 @@ public class ApiReviewSubjectController extends ApiBaseController {
         render(Ret.ok().data(ReviewSubjectWrapper.build().entityVO(review)));
     }
 
-    @ApiOperation("上传整改结果环节")
+    @ApiOperation("整改落实")
     @PostMapping("state/result")
     @ResponseBody
     @DynamicResponseParameters(properties = {

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSubject.java

@@ -28,12 +28,21 @@ public class ReviewSubject extends BaseEntity {
     //当前环节 (内部上报拟评议部门inReport:1 上报评议部门report:2 向社会征求被评议部门意见ask:3
     //调查报告check:4 评议意见opinion:5 整改结果result:6 公示public:7)
     public static Integer STATE_IN_REPORT = 1;
-    public static Integer STATE_REPORT = 2;
+//    public static Integer STATE_REPORT = 2;
-    public static Integer STATE_ASK = 3;
+//    public static Integer STATE_ASK = 3;
-    public static Integer STATE_CHECK = 4;
+    public static Integer STATE_CHECK = 2;
-    public static Integer STATE_OPINION = 5;
+    public static Integer STATE_OPINION = 3;
-    public static Integer STATE_RESULT = 6;
+    public static Integer STATE_RESULT = 4;
-    public static Integer STATE_PUBLIC = 7;
+    public static Integer STATE_PUBLIC = 5;
+
+    @ApiModelProperty(value = "询问时间")
+    String queryTime;
+
+    @ApiModelProperty(value = "参加对象")
+    private String inObject;
+
+    @ApiModelProperty(value = "询问测评")
+    private String askEvaluate;
 
     /**
      * 创建者

src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSubjectAttachment.java

@@ -70,4 +70,8 @@ public class ReviewSubjectAttachment extends BaseEntity {
     @ApiModelProperty(value = "会议名称")
     private String conferenceName;
 
+    @ApiModelProperty(value = "分类")
+    private String category;
+
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/dto/ReviewSubjectDto.java

@@ -14,10 +14,16 @@ public class ReviewSubjectDto extends ReviewSubject {
     List<ReviewSubjectAttachment> inReportAttachmentList;
     @ApiModelProperty(value = "自查/调查报告")
     List<ReviewSubjectAttachment> checkAttachmentList;
+    @ApiModelProperty(value = "会议方案")
+    List<ReviewSubjectAttachment> meetingPlanAttachmentList;
+    @ApiModelProperty(value = "询问设计")
+    List<ReviewSubjectAttachment> askAttachmentList;
     @ApiModelProperty(value = "评议意见附件")
     List<ReviewSubjectAttachment> opinionAttachmentList;
     @ApiModelProperty(value = "整改结果附件")
     List<ReviewSubjectAttachment> resultAttachmentList;
+    @ApiModelProperty(value = "跟踪报告")
+    List<ReviewSubjectAttachment> trailReportAttachmentList;
 
     @ApiModelProperty(value = "一级审批人员")
     List<ReviewSubjectAudit> inReportAudit1List;

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_subject/state/ReviewSubjectCheckStateRequest.java

@@ -33,20 +33,38 @@ public class ReviewSubjectCheckStateRequest {
     private LocalDateTime checkUploadAt;
 
 
+    //    @ApiModelProperty(value = "打分人员 英文逗号间隔")
+//    String checkUserIds;
+//    /**
+//     * 测评对象
+//     */
+//    @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
+//    private String obj;
     @ApiModelProperty(value = "附件名 英文逗号间隔")
     String checkAttachmentName;
     @ApiModelProperty(value = "附件路径 英文逗号间隔")
     String checkAttachmentPath;
-    @ApiModelProperty(value = "打分人员 英文逗号间隔")
-    String checkUserIds;
-    /**
-     * 测评对象
-     */
-    @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
-    private String obj;
-
     @ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
     String checkAttachmentConferenceId;
     @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
     String checkAttachmentConferenceName;
+
+    @ApiModelProperty(value = "会议方案附件名 英文逗号间隔")
+    String meetingPlanAttachmentName;
+    @ApiModelProperty(value = "会议方案附件路径 英文逗号间隔")
+    String meetingPlanAttachmentPath;
+    @ApiModelProperty(value = "会议方案附件关联会议id 英文逗号间隔")
+    String meetingPlanAttachmentConferenceId;
+    @ApiModelProperty(value = "会议方案附件关联会议名称 英文逗号间隔")
+    String meetingPlanAttachmentConferenceName;
+
+    @ApiModelProperty(value = "询问设计附件名 英文逗号间隔")
+    String askAttachmentName;
+    @ApiModelProperty(value = "询问设计附件路径 英文逗号间隔")
+    String askAttachmentPath;
+    @ApiModelProperty(value = "询问设计附件关联会议id 英文逗号间隔")
+    String askAttachmentConferenceId;
+    @ApiModelProperty(value = "询问设计附件关联会议名称 英文逗号间隔")
+    String askAttachmentConferenceName;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_subject/state/ReviewSubjectInReportStateRequest.java

@@ -17,11 +17,11 @@ public class ReviewSubjectInReportStateRequest {
     @ApiModelProperty(value = "评议主题(评议部门,评议专题,评议对象)",required = true)
     private String reviewSubject;
 
-    /**
+//    /**
-     * 评议主题
+//     * 评议主题
-     */
+//     */
-    @ApiModelProperty(value = "分类",required = true)
+//    @ApiModelProperty(value = "分类", required = true)
-    private String type;
+//    private String type;
 
     /**
      * 评议描述
@@ -29,26 +29,28 @@ public class ReviewSubjectInReportStateRequest {
     @ApiModelProperty(value = "评议描述(评议部门描述,评议专题描述,评议对象职位)")
     private String reviewDesc;
 
-    /**
+    //    /**
-     * 提名上传时间
+//     * 提名上传时间
-     */
+//     */
-    @DateTimeFormat(
+//    @DateTimeFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss"
+//            pattern = "yyyy-MM-dd HH:mm:ss"
-    )
+//    )
-    @JsonFormat(
+//    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss"
+//            pattern = "yyyy-MM-dd HH:mm:ss"
-    )
+//    )
-    @ApiModelProperty(value = "提名上传时间")
+//    @ApiModelProperty(value = "提名上传时间")
-    private LocalDateTime reviewUploadAt;
+//    private LocalDateTime reviewUploadAt;
+    @ApiModelProperty(value = "询问时间")
+    String queryTime;
 
     @ApiModelProperty(value = "附件名 英文逗号间隔")
     String inReportAttachmentName;
     @ApiModelProperty(value = "附件路径 英文逗号间隔")
     String inReportAttachmentPath;
-    @ApiModelProperty(value = "一级审批人 英文逗号间隔")
+//    @ApiModelProperty(value = "一级审批人 英文逗号间隔")
-    String inReportAudit1Ids;
+//    String inReportAudit1Ids;
-    @ApiModelProperty(value = "二级审批人 英文逗号间隔")
+//    @ApiModelProperty(value = "二级审批人 英文逗号间隔")
-    String inReportAudit2Ids;
+//    String inReportAudit2Ids;
 
     @ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
     String inReportAttachmentConferenceId;

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_subject/state/ReviewSubjectOpinionStateRequest.java

@@ -20,6 +20,12 @@ public class ReviewSubjectOpinionStateRequest {
     @ApiModelProperty(value = "评议意见备注")
     private String opinionRemark;
 
+    @ApiModelProperty(value = "参加对象")
+    private String inObject;
+
+    @ApiModelProperty(value = "询问测评")
+    private String askEvaluate;
+
     /**
      * 评议意见上传时间
      */

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_subject/state/ReviewSubjectResultStateRequest.java

@@ -36,10 +36,18 @@ public class ReviewSubjectResultStateRequest {
     String resultAttachmentName;
     @ApiModelProperty(value = "附件路径 英文逗号间隔")
     String resultAttachmentPath;
-    String opinionAttachmentPath;
     @ApiModelProperty(value = "附件关联会议id 英文逗号间隔")
     String   resultAttachmentConferenceId;
     @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
     String  resultAttachmentConferenceName;
 
+    @ApiModelProperty(value = "跟踪报告附件名 英文逗号间隔")
+    String trailReportAttachmentName;
+    @ApiModelProperty(value = "跟踪报告附件路径 英文逗号间隔")
+    String trailReportAttachmentPath;
+    @ApiModelProperty(value = "跟踪报告附件关联会议id 英文逗号间隔")
+    String   trailReportAttachmentConferenceId;
+    @ApiModelProperty(value = "跟踪报告附件关联会议名称 英文逗号间隔")
+    String  trailReportAttachmentConferenceName;
+
 }

src/main/java/com/ydool/boot/modules/rddb/service/ReviewSubjectService.java

@@ -139,7 +139,7 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
     @Transactional
     public ReviewSubject stateInReportSave(ReviewSubjectInReportStateRequest reviewSubjectInReportStateRequest, User loginUser) {
         ReviewSubject reviewSubject = BeanUtil.copyProperties(reviewSubjectInReportStateRequest, ReviewSubject.class);
-        reviewSubject.setState(ReviewSubject.STATE_IN_REPORT);
+        reviewSubject.setState(ReviewSubject.STATE_CHECK);
         reviewSubject.setStatus(0);
         reviewSubject.setCreatedId(loginUser.getId());
         saveOrUpdate(reviewSubject);
@@ -148,8 +148,8 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
                 reviewSubjectInReportStateRequest.getInReportAttachmentPath(), loginUser,
                 ReviewSubject.STATE_IN_REPORT, reviewSubjectInReportStateRequest.getInReportAttachmentConferenceId(),
                 reviewSubjectInReportStateRequest.getInReportAttachmentConferenceName());
-        saveReviewSubjectAudit(reviewSubject.getId(), reviewSubjectInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
+//        saveReviewSubjectAudit(reviewSubject.getId(), reviewSubjectInReportStateRequest.getInReportAudit1Ids(), loginUser, 1);
-        saveReviewSubjectAudit(reviewSubject.getId(), reviewSubjectInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
+//        saveReviewSubjectAudit(reviewSubject.getId(), reviewSubjectInReportStateRequest.getInReportAudit2Ids(), loginUser, 2);
         return reviewSubject;
     }
 
@@ -206,13 +206,22 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
         Assert.notNull(reviewSubject, "未找到该记录");
         if (ReviewSubject.STATE_CHECK != reviewSubject.getState()) throw new ResultException(Ret.fail("当前环节不能提交该信息"));
         BeanUtil.copyProperties(reviewSubjectCheckStateRequest, reviewSubject);
+        reviewSubject.setState(ReviewSubject.STATE_OPINION);
         saveOrUpdate(reviewSubject);
 
         saveReviewSubjectAttachment(reviewSubject.getId(),
                 reviewSubjectCheckStateRequest.getCheckAttachmentName(),
-                reviewSubjectCheckStateRequest.getCheckAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK,
+                reviewSubjectCheckStateRequest.getCheckAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "1",
                 reviewSubjectCheckStateRequest.getCheckAttachmentConferenceId(), reviewSubjectCheckStateRequest.getCheckAttachmentConferenceName());
-        saveReviewSubjectUser(reviewSubject.getId(), reviewSubjectCheckStateRequest.getCheckUserIds(), loginUser);
+        saveReviewSubjectAttachment(reviewSubject.getId(),
+                reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceName(),
+                reviewSubjectCheckStateRequest.getMeetingPlanAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "2",
+                reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceId(), reviewSubjectCheckStateRequest.getMeetingPlanAttachmentConferenceName());
+        saveReviewSubjectAttachment(reviewSubject.getId(),
+                reviewSubjectCheckStateRequest.getAskAttachmentName(),
+                reviewSubjectCheckStateRequest.getAskAttachmentPath(), loginUser, ReviewSubject.STATE_CHECK, "3",
+                reviewSubjectCheckStateRequest.getAskAttachmentConferenceId(), reviewSubjectCheckStateRequest.getAskAttachmentConferenceName());
+//        saveReviewSubjectUser(reviewSubject.getId(), reviewSubjectCheckStateRequest.getCheckUserIds(), loginUser);
         return reviewSubject;
     }
 
@@ -274,8 +283,12 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
         saveOrUpdate(reviewSubject);
 
         saveReviewSubjectAttachment(reviewSubject.getId(), reviewSubjectResultStateRequest.getResultAttachmentName(), reviewSubjectResultStateRequest.getResultAttachmentPath(),
-                loginUser, ReviewSubject.STATE_RESULT,
+                loginUser, ReviewSubject.STATE_RESULT,"1",
                 reviewSubjectResultStateRequest.getResultAttachmentConferenceId(), reviewSubjectResultStateRequest.getResultAttachmentConferenceName());
+        saveReviewSubjectAttachment(reviewSubject.getId(), reviewSubjectResultStateRequest.getTrailReportAttachmentName(),
+                reviewSubjectResultStateRequest.getTrailReportAttachmentPath(),
+                loginUser, ReviewSubject.STATE_RESULT,"2",
+                reviewSubjectResultStateRequest.getTrailReportAttachmentConferenceId(), reviewSubjectResultStateRequest.getTrailReportAttachmentConferenceName());
         return reviewSubject;
     }
 
@@ -465,4 +478,53 @@ public class ReviewSubjectService extends BaseService<ReviewSubjectMapper, Revie
         }
     }
 
+    /**
+     * @param reviewId
+     * @param attachmentName
+     * @param attachmentPath
+     * @param loginUser
+     * @param state
+     */
+    private void saveReviewSubjectAttachment(String reviewId,
+                                             String attachmentName,
+                                             String attachmentPath, User loginUser, Integer state, String category,
+                                             String conferenceId
+            , String conferenceName) {
+        reviewSubjectAttachmentService.remove(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+                .eq(ReviewSubjectAttachment::getReviewId, reviewId)
+                .eq(ReviewSubjectAttachment::getType, state));
+        if (StrUtil.isNotBlank(attachmentName)) {
+            String[] nameArr = attachmentName.split(",");
+            String[] pathArr = attachmentPath.split(",");
+            if(StrUtil.isNotBlank(conferenceId)){
+                String[] conferenceIdArr = conferenceId.split(",");
+                String[] conferenceNameArr = conferenceName.split(",");
+                for (int i = 0; i < nameArr.length; i++) {
+                    ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
+                    reviewAttachment.setType(state).setCategory(category)
+                            .setReviewId(reviewId)
+                            .setTitle(nameArr[i]).setConferenceId(conferenceIdArr[i])
+                            .setConferenceName(conferenceNameArr[i])
+                            .setAttachment(pathArr[i])
+                            .setCreatedId(loginUser.getId())
+                            .setCreatedAt(LocalDateTime.now());
+                    if (StrUtil.isNotBlank(conferenceIdArr[i])) {
+                        conferenceAttachmentService.associationMeeting(conferenceIdArr[i], pathArr[i], nameArr[i], "专题评议附件", loginUser.getId());
+                    }
+                    reviewSubjectAttachmentService.save(reviewAttachment);
+                }
+            }else{
+                for (int i = 0; i < nameArr.length; i++) {
+                    ReviewSubjectAttachment reviewAttachment = new ReviewSubjectAttachment();
+                    reviewAttachment.setType(state).setCategory(category)
+                            .setReviewId(reviewId)
+                            .setAttachment(pathArr[i])
+                            .setCreatedId(loginUser.getId())
+                            .setCreatedAt(LocalDateTime.now());
+                    reviewSubjectAttachmentService.save(reviewAttachment);
+                }
+            }
+        }
+    }
+
 }

src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java

@@ -37,11 +37,13 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
     public ReviewSubjectDto entityVO(ReviewSubject reviewSubject) {
         ReviewSubjectDto ReviewSubjectDto = BeanUtil.copyProperties(reviewSubject, ReviewSubjectDto.class);
 
-        ReviewSubjectAttachmentService reviewSubjectAttachmentService = SpringUtils.getBean(ReviewSubjectAttachmentService.class);
+        ReviewSubjectAttachmentService reviewSubjectAttachmentService =
+                SpringUtils.getBean(ReviewSubjectAttachmentService.class);
         ReviewSubjectUserService reviewSubjectUserService = SpringUtils.getBean(ReviewSubjectUserService.class);
         ReviewSubjectAuditService reviewSubjectAuditService = SpringUtils.getBean(ReviewSubjectAuditService.class);
 
-        List<ReviewSubjectAttachment> inReportAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+        List<ReviewSubjectAttachment> inReportAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
                 .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_IN_REPORT)
                 .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
@@ -58,9 +60,11 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
                 }
             });
         }
-        List<ReviewSubjectAttachment> checkAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+        List<ReviewSubjectAttachment> checkAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
                 .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_CHECK)
+                .eq(ReviewSubjectAttachment::getCategory, "1")
                 .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
         //获取关联会议名称
         if (CollectionUtil.isNotEmpty(checkAttachmentList)) {
@@ -75,7 +79,47 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
                 }
             });
         }
-        List<ReviewSubjectAttachment> opinionAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+        List<ReviewSubjectAttachment> meetingPlanAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+                .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
+                .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_CHECK)
+                .eq(ReviewSubjectAttachment::getCategory, "2")
+                .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
+        //获取关联会议名称
+        if (CollectionUtil.isNotEmpty(meetingPlanAttachmentList)) {
+            meetingPlanAttachmentList.stream().forEach(i -> {
+                if (StrUtil.isNotBlank(i.getConferenceId())) {
+                    Conference conference = conferenceMapper.selectById(i.getConferenceId());
+                    String conferenceName = "";
+                    if (conference != null) {
+                        conferenceName = conference.getTitle();
+                    }
+                    i.setConferenceName(conferenceName);
+                }
+            });
+        }
+        List<ReviewSubjectAttachment> askAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+                .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
+                .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_CHECK)
+                .eq(ReviewSubjectAttachment::getCategory, "3")
+                .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
+        //获取关联会议名称
+        if (CollectionUtil.isNotEmpty(askAttachmentList)) {
+            askAttachmentList.stream().forEach(i -> {
+                if (StrUtil.isNotBlank(i.getConferenceId())) {
+                    Conference conference = conferenceMapper.selectById(i.getConferenceId());
+                    String conferenceName = "";
+                    if (conference != null) {
+                        conferenceName = conference.getTitle();
+                    }
+                    i.setConferenceName(conferenceName);
+                }
+            });
+        }
+
+        List<ReviewSubjectAttachment> opinionAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
                 .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_OPINION)
                 .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
@@ -92,9 +136,11 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
                 }
             });
         }
-        List<ReviewSubjectAttachment> resultAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+        List<ReviewSubjectAttachment> resultAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
                 .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_RESULT)
+                .eq(ReviewSubjectAttachment::getCategory, "1")
                 .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
         //获取关联会议名称
         if (CollectionUtil.isNotEmpty(resultAttachmentList)) {
@@ -110,22 +156,48 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
             });
         }
 
-        List<ReviewSubjectAudit> inReportAudit1List = reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
+        List<ReviewSubjectAttachment> trailReportAttachmentList =
+                reviewSubjectAttachmentService.list(new LambdaQueryWrapper<ReviewSubjectAttachment>()
+                .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId())
+                .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_RESULT)
+                .eq(ReviewSubjectAttachment::getCategory, "2")
+                .orderByDesc(ReviewSubjectAttachment::getCreatedAt));
+        //获取关联会议名称
+        if (CollectionUtil.isNotEmpty(trailReportAttachmentList)) {
+            trailReportAttachmentList.stream().forEach(i -> {
+                if (StrUtil.isNotBlank(i.getConferenceId())) {
+                    Conference conference = conferenceMapper.selectById(i.getConferenceId());
+                    String conferenceName = "";
+                    if (conference != null) {
+                        conferenceName = conference.getTitle();
+                    }
+                    i.setConferenceName(conferenceName);
+                }
+            });
+        }
+
+        List<ReviewSubjectAudit> inReportAudit1List =
+                reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
                 .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAudit::getLevel, 1)
                 .orderByAsc(ReviewSubjectAudit::getSortNo));
-        List<ReviewSubjectAudit> inReportAudit2List = reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
+        List<ReviewSubjectAudit> inReportAudit2List =
+                reviewSubjectAuditService.list(new LambdaQueryWrapper<ReviewSubjectAudit>()
                 .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                 .eq(ReviewSubjectAudit::getLevel, 2)
                 .orderByAsc(ReviewSubjectAudit::getSortNo));
-        List<ReviewSubjectUser> checkUserList = reviewSubjectUserService.list(new LambdaQueryWrapper<ReviewSubjectUser>()
+        List<ReviewSubjectUser> checkUserList =
+                reviewSubjectUserService.list(new LambdaQueryWrapper<ReviewSubjectUser>()
                 .eq(ReviewSubjectUser::getReviewId, reviewSubject.getId())
                 .orderByAsc(ReviewSubjectUser::getSortNo));
 
         ReviewSubjectDto.setInReportAttachmentList(inReportAttachmentList);
         ReviewSubjectDto.setCheckAttachmentList(checkAttachmentList);
+        ReviewSubjectDto.setMeetingPlanAttachmentList(meetingPlanAttachmentList);
+        ReviewSubjectDto.setAskAttachmentList(askAttachmentList);
         ReviewSubjectDto.setOpinionAttachmentList(opinionAttachmentList);
         ReviewSubjectDto.setResultAttachmentList(resultAttachmentList);
+        ReviewSubjectDto.setTrailReportAttachmentList(trailReportAttachmentList);
 
         ReviewSubjectDto.setInReportAudit1List(inReportAudit1List);
         ReviewSubjectDto.setInReportAudit2List(inReportAudit2List);
@@ -134,7 +206,8 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
         //打分结束算平均分
         if (ReviewSubject.STATE_CHECK < reviewSubject.getState()) {
             //没打分的不算
-            List<ReviewSubjectUser> scoredReviewUserList = checkUserList.stream().filter(item -> item.getScore() != null).collect(Collectors.toList());
+            List<ReviewSubjectUser> scoredReviewUserList =
+                    checkUserList.stream().filter(item -> item.getScore() != null).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(scoredReviewUserList)) {
                 BigDecimal averageScore = scoredReviewUserList.stream().map(item -> item.getScore())
                         .reduce(BigDecimal.ZERO, BigDecimal::add)
@@ -158,11 +231,13 @@ public class ReviewSubjectWrapper extends BaseWrapper<ReviewSubject, ReviewSubje
         if (userInfo != null) {
             if (userInfo.getId().equals(reviewSubject.getCreatedId())) ReviewSubjectDto.setIsCreator(true);
 
-            ReviewSubjectAudit myReviewAudit1 = reviewSubjectAuditService.getOne(new LambdaQueryWrapper<ReviewSubjectAudit>()
+            ReviewSubjectAudit myReviewAudit1 =
+                    reviewSubjectAuditService.getOne(new LambdaQueryWrapper<ReviewSubjectAudit>()
                     .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                     .eq(ReviewSubjectAudit::getLevel, 1)
                     .eq(ReviewSubjectAudit::getUserId, userInfo.getId()));
-            ReviewSubjectAudit myReviewAudit2 = reviewSubjectAuditService.getOne(new LambdaQueryWrapper<ReviewSubjectAudit>()
+            ReviewSubjectAudit myReviewAudit2 =
+                    reviewSubjectAuditService.getOne(new LambdaQueryWrapper<ReviewSubjectAudit>()
                     .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId())
                     .eq(ReviewSubjectAudit::getLevel, 2)
                     .eq(ReviewSubjectAudit::getUserId, userInfo.getId()));

src/main/resources/views/dist/css/chunk-682e9028.83aac61b.css

@@ -1 +0,0 @@
-.fileOverViewBox[data-v-047dac0e]{background:#000;width:100%}.fileOverViewBox .fileOverViewContentBox[data-v-047dac0e]{width:100%;margin:0 auto;background:#fff}.fileOverViewBox .fileOverViewContentBox .pdf_lif[data-v-047dac0e]{position:fixed;z-index:10}.fileOverViewBox .fileOverViewContentBox .pdf_lif .prev[data-v-047dac0e]{flex:1;text-align:center;padding:.26667rem;position:fixed;left:0;top:50%}.fileOverViewBox .fileOverViewContentBox .pdf_lif .prev img[data-v-047dac0e]{width:.8rem;height:.8rem}.fileOverViewBox .fileOverViewContentBox .pdf_lif .next[data-v-047dac0e]{flex:1;text-align:center;padding:.26667rem;position:fixed;right:0;top:50%}.fileOverViewBox .fileOverViewContentBox .pdf_lif .next img[data-v-047dac0e]{width:.8rem;height:.8rem}.fileOverViewBox .fileOverViewContentBox .arrow[data-v-047dac0e]{position:fixed;width:100%;height:1.6rem;z-index:100;box-shadow:0 .05333rem .05333rem rgba(0,0,0,.5);background:hsla(0,0%,100%,.9)}.fileOverViewBox .fileOverViewContentBox .arrow .turn[data-v-047dac0e]{cursor:pointer}.fileOverViewBox .fileOverViewContentBox .arrow .turn[data-v-047dac0e]:hover{color:#58a5fe}.fileOverViewBox .fileOverViewContentBox .arrow .pageBox[data-v-047dac0e]{margin:0 .53333rem}.fileOverViewBox .fileOverViewContentBox .button_content[data-v-047dac0e]{position:fixed;right:.42667rem;bottom:1.6rem;z-index:9999}.fileOverViewBox .fileOverViewContentBox .button_content .box[data-v-047dac0e]{width:1.06667rem;height:1.06667rem;margin-bottom:.53333rem;background-color:#fff;border-radius:50%;box-shadow:0 0 .26667rem .05333rem #efefef;padding:.24rem;font-size:0}.fileOverViewBox .fileOverViewContentBox .cloee[data-v-047dac0e]{overflow:hidden}.fileOverViewBox .fileOverViewContentBox[data-v-047dac0e] .docViewBox{width:100%;padding:.53333rem;font-size:.42667rem;line-height:1.6;overflow:hidden}.fileOverViewBox .fileOverViewContentBox[data-v-047dac0e] .docViewBox p{margin:.21333rem .10667rem;line-height:1.6;text-indent:2em}.fileOverViewBox .fileOverViewContentBox[data-v-047dac0e] .docViewBox img{margin:.37333rem 0;overflow:hidden}.fileOverViewBox .fileOverViewContentBox[data-v-047dac0e] .docViewBox li{margin:.21333rem 0;line-height:1.6;text-indent:2em}.ifra iframe[data-v-047dac0e]{position:fixed;top:1.22667rem;width:100%;height:94%;bottom:0}