From 4cf41dd005beee7a3b55dfc0908e37540a7bb555 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 31 Jul 2026 13:51:33 +0800 Subject: [PATCH] fix bug --- .../app/executor/institution/EvalTechReviewExecutor.java | 7 ------- .../qinan/safetyeval/domain/constant/ProjectStageEnum.java | 4 +++- .../infrastructure/gatewayimpl/EvalProjectGatewayImpl.java | 6 +++++- .../queryservice/impl/EvalReportQueryServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) 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 93e03e1..64aeca7 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 @@ -174,13 +174,6 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId()); if (entity == null) { 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-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProjectStageEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProjectStageEnum.java index cf3fb3c..4bb2e20 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProjectStageEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProjectStageEnum.java @@ -21,7 +21,9 @@ public enum ProjectStageEnum { REPORT_PREPARATION("REPORT_PREPARATION", "报告编制", "NODE_05"), INTERNAL_REVIEW("INTERNAL_REVIEW", "内部审核", "NODE_06"), TECHNICAL_REVIEW("TECHNICAL_REVIEW", "技术审核", "NODE_07"), - PROCESS_CONTROL("PROCESS_CONTROL", "过程控制", "NODE_08"); + PROCESS_CONTROL("PROCESS_CONTROL", "过程控制", "NODE_08"), + ARCHIVE("ARCHIVE", "归档", "NODE_09"), + ; @Getter private final String val; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java index c50ef0c..b18905a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java @@ -58,7 +58,11 @@ public class EvalProjectGatewayImpl implements EvalProjectGateway { dataObject.setArchiveFlag(0); } InsertFieldDefaults.apply(dataObject); - dataObject.setProjectNode("[{\"type\":\"RISK_ANALYSIS\",\"state\":0},{\"type\":\"BUSINESS_CONTRACT\",\"state\":0},{\"type\":\"PROJECT_GROUP\",\"state\":0},{\"type\":\"SITE_SURVEY\",\"state\":0},{\"type\":\"REPORT_PREPARATION\",\"state\":0},{\"type\":\"INTERNAL_REVIEW\",\"state\":0},{\"type\":\"TECHNICAL_REVIEW\",\"state\":0},{\"type\":\"PROCESS_CONTROL\",\"state\":0}]"); + dataObject.setProjectNode("[{\"type\":\"RISK_ANALYSIS\",\"state\":0}" + + ",{\"type\":\"BUSINESS_CONTRACT\",\"state\":0},{\"type\":\"PROJECT_GROUP\",\"state\":0}," + + "{\"type\":\"SITE_SURVEY\",\"state\":0},{\"type\":\"REPORT_PREPARATION\",\"state\":0}" + + ",{\"type\":\"INTERNAL_REVIEW\",\"state\":0},{\"type\":\"TECHNICAL_REVIEW\",\"state\":0}" + + ",{\"type\":\"PROCESS_CONTROL\",\"state\":0},{\"type\":\"ARCHIVE\",\"state\":0}]"); evalProjectMapper.insert(dataObject); entity.setId(dataObject.getId()); return entity; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReportQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReportQueryServiceImpl.java index 08fd268..f990480 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReportQueryServiceImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReportQueryServiceImpl.java @@ -38,7 +38,7 @@ public class EvalReportQueryServiceImpl implements EvalReportQueryService { if (report.getFileUrl() != null) { EvalProjectFileCO co = new EvalProjectFileCO(); co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg()); - co.setItemName("归档报告"); + co.setItemName(ProjectStageEnum.PROCESS_CONTROL.getMsg()); co.setProjectDocUrl(report.getFileUrl()); files.add(co); }