cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

dev
luotaiqian 2026-07-24 18:05:29 +08:00
parent 1ff0af62d2
commit 6dee2d13fe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java
View File

@ -93,7 +93,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
EvalCmdCopy.apply(cmd, entity); EvalCmdCopy.apply(cmd, entity);
evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity); evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity);
entity = evalInternalReviewGateway.modify(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)); return SingleResponse.success(EvalNodeCoConverter.toInternalCO(entity));
} }

18
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java
View File

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