fix: 年度制修订-上传报错

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -567,7 +567,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
             item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
             item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setEnStandardSystem(excelUtils.translateDictValue("node_name", "id", "laws_tree_node", item.getEnStandardSystem(), listDict));
+            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
             item.setContactUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getContactUser(), listDict));
             item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
             item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -470,7 +470,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
             item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
             item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setEnStandardSystem(excelUtils.translateDictValue("node_name", "id", "laws_tree_node", item.getEnStandardSystem(), listDict));
+            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
             item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
             item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
             item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));

laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java

@@ -394,8 +394,8 @@ public class ExcelUtils {
                 return "";
             }
         }
-        // 检查主起草人
+        // 检查标准体系
-        if (!excelUtils.validDict("node_name", value, "laws_tree_node", "id", false, listDict)) {
+        if (!importUtil.enStandardSystemValid(value)) {
             return "'标准体系'无效。";
         }
         return "";

laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java

@@ -888,6 +888,22 @@ public class ImportUtil {
         return true;
     }
 
+    // 体系校验
+    public boolean enStandardSystemValid(String cellValue) {
+        List<String> valueList = Arrays.asList(cellValue.split(","));
+        LambdaQueryWrapper<LawsTreeNode> treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        treeNodeLambdaQueryWrapper.in(LawsTreeNode::getNodeName, valueList);
+        treeNodeLambdaQueryWrapper.eq(LawsTreeNode::getModuleCode, "3");
+        List<LawsTreeNode> treeNodeList = lawsTreeNodeService.list(treeNodeLambdaQueryWrapper);
+        Map<String, String> systemMap = treeNodeList.stream().collect(Collectors.toMap(LawsTreeNode::getNodeName, LawsTreeNode::getId));
+        for (String value : valueList) {
+            if (systemMap.get(value) == null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     // 文件校验
     private boolean fileValid(String cellValue, Map<String, File> fileMap) {
         String[] pathList = cellValue.split(",");