工作评议

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

@@ -161,6 +161,30 @@ public class ReviewWork extends BaseEntity {
     @ApiModelProperty(value = "分数")
     private String score;
 
+    /**
+     * 评议时间
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @ApiModelProperty(value = "评议时间")
+    private LocalDateTime reviewStartAt;
+
+    /**
+     * 截止时间
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @ApiModelProperty(value = "截止时间")
+    private LocalDateTime reviewEndAt;
+
     public ReviewWork() {
         //默认公开分数
         this.checkScoreState=1;

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

@@ -43,6 +43,9 @@ public class ReviewWorkCheck extends BaseEntity{
     private String reviewId;
 
 
+    @ApiModelProperty(value = "名称")
+    private String name;
+
 
 
 }

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_work/state/ReviewWorkInReportStateRequest.java

@@ -47,4 +47,29 @@ public class ReviewWorkInReportStateRequest {
     String inReportAttachmentConferenceId;
     @ApiModelProperty(value = "附件关联会议名称 英文逗号间隔")
     String inReportAttachmentConferenceName;
+
+    /**
+     * 评议时间
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @ApiModelProperty(value = "评议时间")
+    private LocalDateTime reviewStartAt;
+
+    /**
+     * 截止时间
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @ApiModelProperty(value = "截止时间")
+    private LocalDateTime reviewEndAt;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/request/review_work/state/WorkCheck.java

@@ -7,6 +7,9 @@ import java.util.List;
 
 @Data
 public class WorkCheck {
+
+    @ApiModelProperty(value = "名称")
+    private String name;
     @ApiModelProperty(value = "附件")
     private List<CheckAttachment> checkAttachments;
 

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

@@ -232,7 +232,7 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
             throw new ResultException(Ret.fail("当前环节不能提交该信息"));
         BeanUtil.copyProperties(workCheckRequest, reviewWork);
         saveOrUpdate(reviewWork);
-        saveReviewWorkCheck(reviewWork,workCheckRequest,loginUser);
+        saveReviewWorkCheck(reviewWork, workCheckRequest, loginUser);
         saveReviewWorkUser(reviewWork.getId(), workCheckRequest.getCheckUserIds().toString(), loginUser);
         return reviewWork;
     }
@@ -253,9 +253,9 @@ public class ReviewWorkService extends BaseService<ReviewWorkMapper, ReviewWork>
         if (CollectionUtil.isNotEmpty(reviewWorkChecks)) {
             reviewWorkChecks.stream().forEach(workCheck -> {
                 //新增附件组
-                ReviewWorkCheck reviewWorkCheck = new ReviewWorkCheck().setReviewId(workCheckRequest.getReviewId());
+                ReviewWorkCheck reviewWorkCheck =
+                        new ReviewWorkCheck().setReviewId(workCheckRequest.getReviewId()).setName(workCheck.getName());
                 reviewWorkCheckService.saveOrUpdate(reviewWorkCheck);
-                workCheck.getCheckAttachments();
 
                 //新增附件
                 List<CheckAttachment> checkAttachments = workCheck.getCheckAttachments();