From 173084e016e438dcfbd9e57ae2ff3b4893cb5989 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Wed, 5 Aug 2026 21:02:28 +0800 Subject: [PATCH] sign --- .../institution/EvalProcessControlExecutor.java | 10 +++++----- .../impl/EvalProcessControlQueryServiceImpl.java | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) 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 a3494ff..2d2f875 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 @@ -372,7 +372,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { upsertProjectWaring(project); // 归档项目资料:将所有项目文件以 ARCHIVED 资料类型存入 eval_project_doc upsertArchivedProjectDocs(projectId, project); - projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode()); + projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.ARCHIVE.getNode()); return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity)); } @@ -427,20 +427,20 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { result.add(item); } else { // 字符串元素,构造为 {url, name} - result.add(buildUrlNameObj(String.valueOf(item))); + result.add(buildUrlNameObj(String.valueOf(item), co.getItemName())); } } } else { // 纯字符串URL - result.add(buildUrlNameObj(trimmed)); + result.add(buildUrlNameObj(trimmed, co.getItemName())); } co.setProjectDocUrl(result.toString()); } - private JSONObject buildUrlNameObj(String url) { + private JSONObject buildUrlNameObj(String url, String itemName) { JSONObject obj = new JSONObject(); obj.put("url", url); - obj.put("name", extractFileName(url)); + obj.put("name", itemName + extractFileName(url)); return obj; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java index 6834464..4f5bede 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java @@ -32,6 +32,7 @@ public class EvalProcessControlQueryServiceImpl implements EvalProcessControlQue .eq(EvalProcessControlDO::getOrgId, orgId) .select(EvalProcessControlDO::getId, EvalProcessControlDO::getHandoverFormUrl, + EvalProcessControlDO::getReviewerSignatureUrl, EvalProcessControlDO::getOrgHeadSignatureUrl)); if (processControl == null) { return Collections.emptyList(); @@ -44,6 +45,13 @@ public class EvalProcessControlQueryServiceImpl implements EvalProcessControlQue co.setProjectDocUrl(processControl.getHandoverFormUrl()); files.add(co); } + if (processControl.getReviewerSignatureUrl() != null) { + EvalProjectFileCO co = new EvalProjectFileCO(); + co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg()); + co.setItemName("过程控制负责人签字"); + co.setProjectDocUrl(processControl.getReviewerSignatureUrl()); + files.add(co); + } if (processControl.getOrgHeadSignatureUrl() != null) { EvalProjectFileCO co = new EvalProjectFileCO(); co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());