init

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalInternalReviewCO.java

@@ -21,8 +21,8 @@ public class EvalInternalReviewCO {
     private String reviewerSignatureUrl;
     @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
     private String reviewerSignatureTaskStatus;
-    @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1")
+    @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
-    private Integer resultCode;
+    private String resultCode;
     @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过")
     private String resultName;
     private String opinionContent;

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java

@@ -7,11 +7,40 @@ import org.qinan.safetyeval.client.item.request.EvalReviewItemAddCmd;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 public class EvalInternalReviewConfirmCmd {
 
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("项目id")
+    private String projectId;
+
+    @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
+    private Integer statusCode;
+
+    @ApiModelProperty(value = "内审人人员id")
+    private String reviewerPersonnelId;
+
+    @ApiModelProperty(value = "内审人姓名", example = "2")
+    private String reviewerName;
+
+    @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
+    private String reviewerSignatureTaskStatus;
+
+    @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
+    private String resultCode;
+
+    @ApiModelProperty(value = "总体审核意见")
+    @Size(max = 2000)
+    private String opinionContent;
+
+    @ApiModelProperty(value = "审核时间", hidden = true)
+    private LocalDateTime reviewTime;
+
     @ApiModelProperty("审核项列表")
     @NotNull
     @Size(min = 1, max = 16)

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewSaveCmd.java

@@ -19,8 +19,8 @@ public class EvalInternalReviewSaveCmd {
     private String reviewerSignatureUrl;
     @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched")
     private String reviewerSignatureTaskStatus;
-    @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1")
+    @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
-    private Integer resultCode;
+    private String resultCode;
     @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过")
     private String resultName;
     private String opinionContent;

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalInternalReviewEntity.java

@@ -17,7 +17,8 @@ public class EvalInternalReviewEntity {
     private String reviewerSignatureUrl;
     /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发 */
     private String reviewerSignatureTaskStatus;
-    private Integer resultCode;
+    /** 审核结果 passed 通过，not_passed 未通过 */
+    private String resultCode;
     private String resultName;
     private String opinionContent;
     private LocalDateTime reviewTime;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalInternalReviewDO.java

@@ -18,8 +18,8 @@ public class EvalInternalReviewDO {
     private String reviewerSignatureUrl;
     /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发 */
     private String reviewerSignatureTaskStatus;
-    /** 审核结果编码：1通过 2退回修改，示例：1 */
+    /** 审核结果 passed 通过，not_passed 未通过 */
-    private Integer resultCode;
+    private String resultCode;
     /** 审核结果名称：通过/退回修改，示例：通过 */
     private String resultName;
     private String opinionContent;