From a8a6e881427f1b3ca678b0bcd850786c527c7553 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Sep 2024 17:08:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=9C=AA=E5=88=86?=
 =?UTF-8?q?=E5=8F=91=E5=AF=BC=E5=87=BA=E6=94=AF=E6=8C=81=E2=80=9C=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=20=E2=80=9D=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessStandardComplianceCheckServiceImpl.java       | 4 +++-
 .../main/java/com/jero/modules/activiti/util/ExcelUtils.java  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 9afcc750..eae5c265 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -918,6 +918,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         list.parallelStream().forEach(item -> {
             item.setResult(excelUtils.translateDictValue("evaluation_result", item.getResult(), listDict));
             item.setMaterial(excelUtils.uploadFile(item.getMaterial(), fileMap));
+            item.setUnsatisfiedRequireAttach(excelUtils.uploadFile(item.getUnsatisfiedRequireAttach(), fileMap));
         });
     }
 
@@ -944,7 +945,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
             // 检查所有数据字典校验的字段
             errMsg.append(excelUtils.validResult(result, listDict));
-            errMsg.append(excelUtils.validMaterial(material, fileMap));
+            errMsg.append(excelUtils.validMaterial(material, fileMap, "佐证材料"));
+            errMsg.append(excelUtils.validMaterial(material, fileMap, "辅助说明材料"));
             // 如果数据有问题，则将提示信息添加到 errorMsgs 中
             if (errMsg.length() > 0) {
                 errorMsgs.add(errMsgHeader.append(errMsg).toString());
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
index c7e615d3..fecbabff 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
@@ -596,12 +596,12 @@ public class ExcelUtils {
         return "";
     }
 
-    public String validMaterial(String value, Map<String, File> fileMap) {
+    public String validMaterial(String value, Map<String, File> fileMap, String title) {
         if (StrUtil.isBlank(value)) {
             return "";
         }
         if (!importUtil.fileValid(value, fileMap)) {
-            return "'佐证材料'无效。";
+            return "'" + title + "'无效。";
         }
         return "";
     }