From e6542e7c5f619a6cf0f6a00d6edf8c1bfc968d9a Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 23 Jul 2026 15:12:28 +0800 Subject: [PATCH] waring --- .../EvalInternalReviewController.java | 4 ++-- .../co/institution/EvalInternalReviewCO.java | 15 +++++++-------- .../EvalInternalReviewAssignCmd.java | 18 +----------------- .../EvalInternalReviewConfirmCmd.java | 9 --------- .../client/item/response/EvalReviewItemCo.java | 12 ++---------- .../domainobject/EvalReviewItemDO.java | 7 +++++++ 6 files changed, 19 insertions(+), 46 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java index 14831b3..ce6f15c 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java @@ -35,11 +35,11 @@ public class EvalInternalReviewController { return evalInternalReviewApi.confirm(cmd); } - /*@ApiOperation("下发签字任务") + @ApiOperation("下发签字任务") @PostMapping("/assign") public SingleResponse assign(@Validated @RequestBody EvalInternalReviewAssignCmd cmd) { return evalInternalReviewApi.assign(cmd); - }*/ + } /*@ApiOperation("按项目查询") @GetMapping("/get") 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 308d66e..38ff78b 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 @@ -15,26 +15,25 @@ public class EvalInternalReviewCO { @ApiModelProperty("项目id") private String projectId; - @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") - private Integer statusCode; - @ApiModelProperty(value = "节点状态名称：未开始/进行中/已完成/退回", example = "进行中") - private String statusName; - @ApiModelProperty("草稿id") - private String draftId; + @ApiModelProperty("内审人员id") private String reviewerPersonnelId; + @ApiModelProperty("内审人员名称") private String reviewerName; + @ApiModelProperty(value = "内审人独立签字") private String reviewerSignatureUrl; + @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched") private String reviewerSignatureTaskStatus; + @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed") private String resultCode; - @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") - private String resultName; + @ApiModelProperty("审核意见内容") private String opinionContent; + @ApiModelProperty("审核时间") private LocalDateTime reviewTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewAssignCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewAssignCmd.java index b6ee7b2..1051388 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewAssignCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewAssignCmd.java @@ -2,29 +2,13 @@ package org.qinan.safetyeval.client.dto.institution; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -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 EvalInternalReviewAssignCmd { - @ApiModelProperty("id") - private Long id; - @ApiModelProperty("项目id") private Long projectId; - @ApiModelProperty(value = "内审人人员id") - private String reviewerPersonnelId; - - @ApiModelProperty(value = "内审人姓名", example = "2") - private String reviewerName; - - @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched") + @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发", example = "non_dispatched", hidden = true) private String reviewerSignatureTaskStatus; } 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 e5d00dc..d1e21f2 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 @@ -22,15 +22,6 @@ public class EvalInternalReviewConfirmCmd { @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") private Integer statusCode; - @ApiModelProperty(value = "内审人人员id") - private Long 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; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java index b25907c..a585d31 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java @@ -1,6 +1,5 @@ package org.qinan.safetyeval.client.item.response; -import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,8 +11,8 @@ import lombok.Data; * @date 2026-07-21 11:54:47 */ @Data -public class EvalReviewItemCo extends ClientObject { - private static final long serialVersionUID = 1L; +public class EvalReviewItemCo { + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; /** @@ -51,11 +50,4 @@ public class EvalReviewItemCo extends ClientObject { */ @ApiModelProperty(value = "审核意见") private String reviewOpinion; - /** - * 环境 - */ - @ApiModelProperty(value = "环境") - private String env; - @ApiModelProperty(value = "version") - private Integer version; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java index a059783..c679608 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.infrastructure.persistence.domainobject; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import lombok.Data; @@ -49,4 +50,10 @@ public class EvalReviewItemDO extends BaseDO { * 环境 */ private String env; + + @TableLogic( + value = "false", + delval = "true" + ) + protected String deleteEnum; }