From 5748fc504ad0eab0281ff381b639d547e7e016c9 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 23 Jul 2026 18:20:42 +0800 Subject: [PATCH] waring --- .../EvalInternalReviewExecutor.java | 2 +- .../EvalProcessControlExecutor.java | 2 +- .../institution/EvalTechReviewExecutor.java | 38 ++++++------------- .../co/institution/EvalProcessControlCO.java | 2 +- .../co/institution/EvalTechReviewCO.java | 2 +- .../EvalProcessControlConfirmCmd.java | 2 +- .../EvalProcessControlSaveCmd.java | 2 +- .../institution/EvalTechReviewConfirmCmd.java | 2 +- .../institution/EvalTechReviewSaveCmd.java | 2 +- .../entity/EvalProcessControlEntity.java | 2 +- .../domain/entity/EvalTechReviewEntity.java | 2 +- .../dataobject/EvalProcessControlDO.java | 2 +- .../dataobject/EvalTechReviewDO.java | 2 +- 13 files changed, 24 insertions(+), 38 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java index ba6e336..7a7b43b 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java @@ -112,7 +112,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { if (evalInternalReviewDO == null) { throw new BizException(ASSIGN_SIGN_TASK); } - if (StringUtils.isBlank(evalInternalReviewDO.getReviewerSignatureUrl())) { + if (!SignatureTaskStatusEnum.COMPLETED.getCode().equals(evalInternalReviewDO.getReviewerSignatureTaskStatus())) { throw new BizException(SIGN_TASK_NOT_COMPLETE); } projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.INTERNAL_REVIEW.getNode()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java index e0e6572..10dc34d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java @@ -129,7 +129,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { EvalProcessControlEntity entity = evalProcessControlConvertor.applyConfirmCmd(cmd); // 过程控制结论为通过时推进项目阶段 - if (cmd.getResultCode() != null && cmd.getResultCode() == 1) { + if (cmd.getResultCode().equals(EvalReviewEnum.PASSED.getCode())) { projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode()); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java index 64f5a01..7520830 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java @@ -1,7 +1,6 @@ package org.qinan.safetyeval.app.executor.institution; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.lang3.StringUtils; import org.qinan.safetyeval.app.executor.institution.support.EvalCmdCopy; import org.qinan.safetyeval.app.executor.institution.support.EvalNodeCoConverter; import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport; @@ -111,9 +110,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { } EvalTechReviewEntity entity = evalTechReviewConvertor.applyConfirmCmd(cmd); - EvalTechReviewDO evalTechReviewDO = evalTechReviewMapper.selectOne(new LambdaQueryWrapper() - .eq(EvalTechReviewDO::getProjectId, cmd.getProjectId()) - .select(EvalTechReviewDO::getId, EvalTechReviewDO::getReviewerSignatureUrl)); + EvalTechReviewDO evalTechReviewDO = evalTechReviewMapper.selectOne(new LambdaQueryWrapper().eq(EvalTechReviewDO::getProjectId, cmd.getProjectId()).select(EvalTechReviewDO::getId, EvalTechReviewDO::getReviewerSignatureUrl)); if (cmd.getId() != null && evalTechReviewDO == null) { throw new BizException(ErrorCode.EVAL_TECH_REVIEW_NOT_FOUND); } @@ -123,7 +120,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { if (evalTechReviewDO == null) { throw new BizException(ASSIGN_SIGN_TASK); } - if (StringUtils.isBlank(evalTechReviewDO.getReviewerSignatureUrl())) { + if (!SignatureTaskStatusEnum.COMPLETED.getCode().equals(evalTechReviewDO.getReviewerSignatureTaskStatus())) { throw new BizException(SIGN_TASK_NOT_COMPLETE); } projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.TECHNICAL_REVIEW.getNode()); @@ -185,14 +182,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { @Override public SingleResponse getDetailByProject(Long projectId) { // 1. 查询项目成员中的技审人信息（role包含TECHNICAL_LEAD） - List members = evalProjectMemberMapper.selectList( - new LambdaQueryWrapper() - .eq(EvalProjectMemberDO::getProjectId, projectId) - .eq(EvalProjectMemberDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .like(EvalProjectMemberDO::getRole, ProjectRoleEnum.TECHNICAL_LEAD.getVal())) - .stream() - .map(evalProjectMemberDoConvertor::convertDoToE) - .collect(Collectors.toList()); + List members = evalProjectMemberMapper.selectList(new LambdaQueryWrapper().eq(EvalProjectMemberDO::getProjectId, projectId).eq(EvalProjectMemberDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).like(EvalProjectMemberDO::getRole, ProjectRoleEnum.TECHNICAL_LEAD.getVal())).stream().map(evalProjectMemberDoConvertor::convertDoToE).collect(Collectors.toList()); // 2. 查询技审记录，未查询到则技审记录字段为空 EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, null); @@ -201,21 +191,17 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { if (entity != null) { detailCO.setTechReview(evalTechReviewConvertor.toTechCO(entity)); // 3. 通过技审记录id查询审核项列表 - detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType( - entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW.getCode())); + detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType(entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW.getCode())); } else { // 未查询到技审记录，按审核维度枚举构建默认审核项 - detailCO.setReviewItems(ReviewDimensionEnum.getListByType(ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW) - .stream() - .map(dimension -> { - EvalReviewItemCo item = new EvalReviewItemCo(); - item.setBizType(ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW.getCode()); - item.setReviewDimensionCode(dimension.getCode()); - item.setReviewDimensionName(dimension.getLabel()); - item.setReviewFocus(dimension.getReviewFocus()); - return item; - }) - .collect(Collectors.toList())); + detailCO.setReviewItems(ReviewDimensionEnum.getListByType(ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW).stream().map(dimension -> { + EvalReviewItemCo item = new EvalReviewItemCo(); + item.setBizType(ReviewDimensionEnum.TypeEnum.EVAL_TECH_REVIEW.getCode()); + item.setReviewDimensionCode(dimension.getCode()); + item.setReviewDimensionName(dimension.getLabel()); + item.setReviewFocus(dimension.getReviewFocus()); + return item; + }).collect(Collectors.toList())); } return SingleResponse.success(detailCO); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java index 4e5b2a7..370228d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java @@ -155,7 +155,7 @@ public class EvalProcessControlCO { @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成", example = "non_dispatched") private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "过程控制结论编码：1通过 2退回", example = "1") - private Integer resultCode; + 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/co/institution/EvalTechReviewCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalTechReviewCO.java index 8e0a1c8..dc1e5c7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalTechReviewCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalTechReviewCO.java @@ -155,7 +155,7 @@ public class EvalTechReviewCO { @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发，completed 已完成", example = "non_dispatched") private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; + 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/EvalProcessControlConfirmCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlConfirmCmd.java index cef10a7..3e8a5ac 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlConfirmCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlConfirmCmd.java @@ -26,7 +26,7 @@ public class EvalProcessControlConfirmCmd { private String controllerName; @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed") - private Integer resultCode; + private String resultCode; @ApiModelProperty(value = "总体过程控制意见") @Size(max = 2000) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java index 72ced17..3b9e4ce 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java @@ -145,7 +145,7 @@ public class EvalProcessControlSaveCmd { @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成", example = "non_dispatched") private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "过程控制结论编码：1通过 2退回", example = "1") - private Integer resultCode; + 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/EvalTechReviewConfirmCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewConfirmCmd.java index e484ecf..211a4a5 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewConfirmCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewConfirmCmd.java @@ -20,7 +20,7 @@ public class EvalTechReviewConfirmCmd { private Long projectId; @ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "1") - private Integer resultCode; + private String resultCode; @ApiModelProperty(value = "总体审核意见") @Size(max = 2000) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewSaveCmd.java index 0f8e1cd..1da3e24 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewSaveCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewSaveCmd.java @@ -145,7 +145,7 @@ public class EvalTechReviewSaveCmd { @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发，completed 已完成", example = "non_dispatched") private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; + 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/EvalProcessControlEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java index 37f4547..14888b6 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java @@ -17,7 +17,7 @@ public class EvalProcessControlEntity { /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成 */ private String reviewerSignatureTaskStatus; private Integer precheckPassFlag; - private Integer resultCode; + private String resultCode; private String resultName; private String opinionContent; private Integer archiveFlag; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalTechReviewEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalTechReviewEntity.java index 821270d..1e003b6 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalTechReviewEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalTechReviewEntity.java @@ -17,7 +17,7 @@ public class EvalTechReviewEntity { private String reviewerSignatureUrl; /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发，completed 已完成 */ private String reviewerSignatureTaskStatus; - private Integer resultCode; + 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/EvalProcessControlDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java index 9c2304b..c3e09ea 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java @@ -20,7 +20,7 @@ public class EvalProcessControlDO { /** 前7节点是否全部完成：1是 2否，示例：2 */ private Integer precheckPassFlag; /** 过程控制结论编码：1通过 2退回，示例：1 */ - private Integer resultCode; + private String resultCode; /** 过程控制结论名称：通过/退回，示例：通过 */ private String resultName; private String opinionContent; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalTechReviewDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalTechReviewDO.java index ce30a6a..f732ece 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalTechReviewDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalTechReviewDO.java @@ -19,7 +19,7 @@ public class EvalTechReviewDO { /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发，completed 已完成 */ private String reviewerSignatureTaskStatus; /** 审核结果编码：1通过 2退回修改，示例：1 */ - private Integer resultCode; + private String resultCode; /** 审核结果名称：通过/退回修改，示例：通过 */ private String resultName; private String opinionContent;