From f6f9089dc760ae6616210f53a0e5382ce3a2588d Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 7 Aug 2026 10:53:17 +0800 Subject: [PATCH] sign --- .../executor/institution/EvalProcessControlExecutor.java | 7 +++++-- .../qinan/safetyeval/infrastructure/utils/CommonUtil.java | 1 + 2 files changed, 6 insertions(+), 2 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 2d2f875..9805dfa 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 @@ -39,6 +39,7 @@ 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.qinan.safetyeval.infrastructure.utils.CommonUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -440,7 +441,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { private JSONObject buildUrlNameObj(String url, String itemName) { JSONObject obj = new JSONObject(); obj.put("url", url); - obj.put("name", itemName + extractFileName(url)); + obj.put("name", extractFileName(url)); return obj; } @@ -539,10 +540,12 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { if (!CollectionUtils.isEmpty(files)) { for (EvalProjectFileCO f : files) { List urlObjects = parseFileUrlObjects(f.getProjectDocUrl()); + String itemName = f.getItemName(); for (JSONObject obj : urlObjects) { EvalProjectDocMaterialItemCO item = new EvalProjectDocMaterialItemCO(); String name = obj.getStr("name"); - item.setMaterialName(StringUtils.hasText(name) ? name : f.getMaterialName()); + String fName = StringUtils.hasText(name) ? CommonUtil.EMPTY : name; + item.setMaterialName(itemName + fName); item.setProjectDocUrl(obj.getStr("url")); item.setMaterialType(MaterialCategory.ARCHIVED.getVal()); archivedItems.add(item); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java index 8a5b16d..8867492 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java @@ -6,4 +6,5 @@ import lombok.experimental.UtilityClass; public class CommonUtil { public static final String COMMA = ","; public static final String COLON = ":"; + public static final String EMPTY = ""; }