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 cfff727..e31959e 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 @@ -93,7 +93,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { EvalCmdCopy.apply(cmd, entity); evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity); entity = evalInternalReviewGateway.modify(entity); - evalProjectNodeSupport.afterNodeSaved(projectId, EvalNodeCodes.NODE_06, entity.getStatusCode()); + projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.INTERNAL_REVIEW.getNode()); return SingleResponse.success(EvalNodeCoConverter.toInternalCO(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 d80a501..aa27e06 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 @@ -35,14 +35,8 @@ import org.qinan.safetyeval.domain.waring.gateway.EvalProjectWaringGateway; import org.qinan.safetyeval.domain.waring.model.EvalProjectWaringE; import org.qinan.safetyeval.infrastructure.convertor.EvalProcessControlConvertor; import org.qinan.safetyeval.infrastructure.convertor.EvalProjectMemberDoConvertor; -import org.qinan.safetyeval.infrastructure.dataobject.EvalProcessControlDO; -import org.qinan.safetyeval.infrastructure.dataobject.EvalProjectDocDO; -import org.qinan.safetyeval.infrastructure.dataobject.EvalProjectMemberDO; -import org.qinan.safetyeval.infrastructure.dataobject.EvalSignTaskDO; -import org.qinan.safetyeval.infrastructure.mapper.EvalProcessControlMapper; -import org.qinan.safetyeval.infrastructure.mapper.EvalProjectDocMapper; -import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper; -import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper; +import org.qinan.safetyeval.infrastructure.dataobject.*; +import org.qinan.safetyeval.infrastructure.mapper.*; import org.qinan.safetyeval.infrastructure.persistence.queryservice.*; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Service; @@ -108,6 +102,8 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { @Resource private EvalSignTaskMapper evalSignTaskMapper; @Resource + private EvalCustomerMapper evalCustomerMapper; + @Resource private SafetyMessageGateway safetyMessageGateway; @Override @@ -127,7 +123,6 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { EvalCmdCopy.apply(cmd, entity); evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity); entity = evalProcessControlGateway.modify(entity); - evalProjectNodeSupport.afterNodeSaved(projectId, EvalNodeCodes.NODE_08, entity.getStatusCode()); return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); } @@ -346,6 +341,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { upsertProjectWaring(project); // 归档项目资料:将所有项目文件以 ARCHIVED 资料类型存入 eval_project_doc upsertArchivedProjectDocs(projectId, project); + projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode()); return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); } @@ -520,10 +516,14 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { .select(EvalProjectDocDO::getId, EvalProjectDocDO::getProjectDocUrl) .eq(EvalProjectDocDO::getProjectId, projectId)); if (docDO == null) { + EvalCustomerDO evalCustomerDO = evalCustomerMapper.selectOne(new LambdaQueryWrapper() + .select(EvalCustomerDO::getCustomerName) + .eq(EvalCustomerDO::getId, project.getCustomerId())); docDO = new EvalProjectDocDO(); docDO.setOrgId(project.getOrgId()); docDO.setProjectId(projectId); docDO.setProjectNo(project.getProjectNo()); + docDO.setCustomerName(evalCustomerDO.getCustomerName()); docDO.setProjectName(project.getProjectName()); docDO.setEvalTypeCode(project.getEvalTypeCode()); docDO.setProjectDocUrl(JSON.toJSONString(archivedItems));