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

sign

dev
luotaiqian 2026-08-05 21:02:28 +08:00
parent 0dd4fcece8
commit 173084e016
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,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()); projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.ARCHIVE.getNode());
return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity)); return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity));
} }
@ -427,20 +427,20 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
result.add(item); result.add(item);
} else { } else {
// 字符串元素，构造为 {url, name} // 字符串元素，构造为 {url, name}
result.add(buildUrlNameObj(String.valueOf(item))); result.add(buildUrlNameObj(String.valueOf(item), co.getItemName()));
} }
} }
} else { } else {
// 纯字符串URL // 纯字符串URL
result.add(buildUrlNameObj(trimmed)); result.add(buildUrlNameObj(trimmed, co.getItemName()));
} }
co.setProjectDocUrl(result.toString()); co.setProjectDocUrl(result.toString());
} }
private JSONObject buildUrlNameObj(String url) { private JSONObject buildUrlNameObj(String url, String itemName) {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("url", url); obj.put("url", url);
obj.put("name", extractFileName(url)); obj.put("name", itemName + extractFileName(url));
return obj; return obj;
} }

8
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java
View File

@ -32,6 +32,7 @@ public class EvalProcessControlQueryServiceImpl implements EvalProcessControlQue
.eq(EvalProcessControlDO::getOrgId, orgId) .eq(EvalProcessControlDO::getOrgId, orgId)
.select(EvalProcessControlDO::getId, .select(EvalProcessControlDO::getId,
EvalProcessControlDO::getHandoverFormUrl, EvalProcessControlDO::getHandoverFormUrl,
EvalProcessControlDO::getReviewerSignatureUrl,
EvalProcessControlDO::getOrgHeadSignatureUrl)); EvalProcessControlDO::getOrgHeadSignatureUrl));
if (processControl == null) { if (processControl == null) {
return Collections.emptyList(); return Collections.emptyList();
@ -44,6 +45,13 @@ public class EvalProcessControlQueryServiceImpl implements EvalProcessControlQue
co.setProjectDocUrl(processControl.getHandoverFormUrl()); co.setProjectDocUrl(processControl.getHandoverFormUrl());
files.add(co); 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) { if (processControl.getOrgHeadSignatureUrl() != null) {
EvalProjectFileCO co = new EvalProjectFileCO(); EvalProjectFileCO co = new EvalProjectFileCO();
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg()); co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());