From 10e6a9cd1bef780e5afd621ccd487aa434502303 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 21 Jul 2026 16:46:07 +0800 Subject: [PATCH] init --- .../co/institution/EvalInternalReviewCO.java | 4 +-- .../EvalInternalReviewConfirmCmd.java | 29 +++++++++++++++++++ .../EvalInternalReviewSaveCmd.java | 4 +-- .../entity/EvalInternalReviewEntity.java | 3 +- .../dataobject/EvalInternalReviewDO.java | 4 +-- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalInternalReviewCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalInternalReviewCO.java index f2e599b..c01ccb4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalInternalReviewCO.java +++ b/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") - private Integer resultCode; + @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed") + private String resultCode; @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") private String resultName; private String opinionContent; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java index a3aab22..8a005c4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java +++ b/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) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewSaveCmd.java index 1858870..b5c69c5 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewSaveCmd.java +++ b/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") - private Integer resultCode; + @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed") + private String resultCode; @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") private String resultName; private String opinionContent; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalInternalReviewEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalInternalReviewEntity.java index 12e3bad..3cf24ee 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalInternalReviewEntity.java +++ b/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; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalInternalReviewDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalInternalReviewDO.java index 4f3f697..4a2d605 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalInternalReviewDO.java +++ b/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 */ - private Integer resultCode; + /** 审核结果 passed 通过，not_passed 未通过 */ + private String resultCode; /** 审核结果名称：通过/退回修改，示例：通过 */ private String resultName; private String opinionContent;