From 9d371798944bc3f6c5eda9cfbfc8acac11e14e78 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 28 Jul 2026 14:35:36 +0800 Subject: [PATCH] 1 --- .../institution/EvalInternalReviewExecutor.java | 15 ++++++++------- .../institution/EvalProcessControlExecutor.java | 9 ++++----- .../institution/EvalTechReviewExecutor.java | 15 ++++++++------- .../convertor/EvalProcessControlConvertor.java | 6 ++++++ 4 files changed, 26 insertions(+), 19 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 e31959e..3208480 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 @@ -163,13 +163,14 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { } EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(projectId, project.getOrgId()); if (entity == null) { - // 没有数据则新增，并下发签字任务 - entity = new EvalInternalReviewEntity(); - entity.setOrgId(project.getOrgId()); - entity.setProjectId(projectId); - entity.setStatusCode(1); - entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); - evalInternalReviewGateway.save(entity); + throw new BizException(ErrorCode.EVAL_INTERNAL_REVIEW_NOT_FOUND); +// // 没有数据则新增，并下发签字任务 +// entity = new EvalInternalReviewEntity(); +// entity.setOrgId(project.getOrgId()); +// entity.setProjectId(projectId); +// entity.setStatusCode(1); +// entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); +// evalInternalReviewGateway.save(entity); } else { entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); evalInternalReviewGateway.modify(entity); 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 0362df4..2987c89 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 @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; 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; import org.qinan.safetyeval.app.item.convertor.EvalReviewItemCmdConvertor; import org.qinan.safetyeval.client.api.institution.EvalProcessControlApi; @@ -125,7 +124,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { EvalCmdCopy.apply(cmd, entity); evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity); entity = evalProcessControlGateway.modify(entity); - return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); + return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity)); } @Override @@ -247,7 +246,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { if (entity == null) { throw new BizException(ErrorCode.EVAL_PROCESS_NOT_FOUND); } - return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); + return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity)); } @Override @@ -268,7 +267,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { EvalProcessControlDetailCO detailCO = new EvalProcessControlDetailCO(); detailCO.setControllers(evalProcessControlConvertor.toMemberCOs(members)); if (entity != null) { - detailCO.setProcessControl(EvalNodeCoConverter.toProcessCO(entity)); + detailCO.setProcessControl(evalProcessControlConvertor.toProcessCO(entity)); // 3. 通过过程控制记录id查询审核项列表 detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType( entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_PROCESS_CONTROL.getCode())); @@ -344,7 +343,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { // 归档项目资料：将所有项目文件以 ARCHIVED 资料类型存入 eval_project_doc upsertArchivedProjectDocs(projectId, project); projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode()); - return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); + return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity)); } @Override 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 a51ba85..a7da179 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 @@ -172,13 +172,14 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { } EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId()); if (entity == null) { - // 没有数据则新增，并下发签字任务 - entity = new EvalTechReviewEntity(); - entity.setOrgId(project.getOrgId()); - entity.setProjectId(projectId); - entity.setStatusCode(1); - entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); - evalTechReviewGateway.save(entity); + throw new BizException(ErrorCode.EVAL_TECH_REVIEW_NOT_FOUND); +// // 没有数据则新增，并下发签字任务 +// entity = new EvalTechReviewEntity(); +// entity.setOrgId(project.getOrgId()); +// entity.setProjectId(projectId); +// entity.setStatusCode(1); +// entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); +// evalTechReviewGateway.save(entity); } else { entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); evalTechReviewGateway.modify(entity); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/EvalProcessControlConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/EvalProcessControlConvertor.java index 9179948..b06d196 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/EvalProcessControlConvertor.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/EvalProcessControlConvertor.java @@ -1,6 +1,7 @@ package org.qinan.safetyeval.infrastructure.convertor; import org.mapstruct.Mapper; +import org.qinan.safetyeval.client.co.institution.EvalProcessControlCO; import org.qinan.safetyeval.client.co.institution.EvalProjectMemberCO; import org.qinan.safetyeval.client.dto.institution.EvalProcessControlConfirmCmd; import org.qinan.safetyeval.domain.entity.EvalProcessControlEntity; @@ -19,6 +20,11 @@ public interface EvalProcessControlConvertor { */ EvalProcessControlEntity applyConfirmCmd(EvalProcessControlConfirmCmd cmd); + /** + * 将 entity 转换为过程控制 CO。 + */ + EvalProcessControlCO toProcessCO(EvalProcessControlEntity entity); + EvalProjectMemberCO toMemberCO(EvalProjectMemberEntity entity); List toMemberCOs(List entities);