From 79bf382bca74eff8f6e7f5a36b72dc9933bdcc13 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jan 2024 15:57:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080301=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92-=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E6=89=80=E8=81=94=E7=BB=9C=E4=BA=BA=20=E5=A1=AB=E5=86=99/?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1--=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8E=E6=96=B0=E5=A2=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  | 20 +++++--------
 .../ProcessEsAnnualReportServiceImpl.java     |  4 +--
 .../modules/activiti/util/ExcelUtils.java     | 28 +++++++++++++++----
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index a8ee9717..e9dc416f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -612,11 +612,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             errMsg.append(excelUtils.validMainDraftingUnit(mainDraftingUnit, listDict));
             errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
             errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
-            errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict));
+            errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, false));
             errMsg.append(excelUtils.validContactUser(contactUser, listDict));
-            errMsg.append(excelUtils.validStandardType(standardType, listDict));
+            errMsg.append(excelUtils.validStandardType(standardType, listDict, false));
             errMsg.append(excelUtils.validStandardCode(enStandardCode, listDict));
-            errMsg.append(excelUtils.validPartName(partName, listDict));
+            errMsg.append(excelUtils.validPartName(partName, listDict, false));
             errMsg.append(excelUtils.validSingleDateNotBeforeToday(draftPlannedCompleteDateString, "草稿计划完成日期"));
             errMsg.append(excelUtils.validSingleDateNotBeforeToday(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
             errMsg.append(excelUtils.validSingleDateNotBeforeToday(planApprovalDateString, "计划报批日期"));
@@ -641,6 +641,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         }
         // 修订
         if (projectType.equals(ESPProjectType.MODIFY.getName())) {
+            errMsg.append(excelUtils.validStandardName(newEnStandardName));
             // 检查企标编号是否有效
             if (StrUtil.isBlank(originEnStandardNo)) {
                 errMsg.append("'原企标编号'不能为空。");
@@ -655,32 +656,25 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             String enNameCode = plan.getEnNameCode();
             String standardCategoryCode = plan.getStandardCategoryCode();
             // 检查企标编号是否有效
-            if (StrUtil.isBlank(enStandardCode)) {
-                errMsg.append("'企业标准代号'不能为空。");
-            } else {
+            if (StrUtil.isNotBlank(enStandardCode)) {
                 // 检查企业标准代号
                 if (!excelUtils.validDict("enterprise_standard_code", enStandardCode, null, null, true, listDict)) {
                     errMsg.append("'企业标准代号'无效。");
                 }
             }
-            if (StrUtil.isBlank(enNameCode)) {
-                errMsg.append("'企业名称代号'不能为空。");
-            } else {
+            if (StrUtil.isNotBlank(enNameCode)) {
                 // 检查企业标准代号
                 if (!excelUtils.validDict("enterprise_name_code", enNameCode, null, null, true, listDict)) {
                     errMsg.append("'企业名称代号'无效。");
                 }
             }
-            if (StrUtil.isBlank(standardCategoryCode)) {
-                errMsg.append("'标准类别代号'不能为空。");
-            } else {
+            if (StrUtil.isNotBlank(standardCategoryCode)) {
                 // 检查企业标准代号
                 if (!excelUtils.validDict("standard_category_code", standardCategoryCode, null, null, true, listDict)) {
                     errMsg.append("'标准类别代号'无效。");
                 }
             }
         }
-        errMsg.append(excelUtils.validStandardName(newEnStandardName));
         return errMsg.toString();
     }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 07670016..9d9b68e2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -490,8 +490,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
             errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
             errMsg.append(excelUtils.validWorkGroup(workGroup, listDict));
-            errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict));
-            errMsg.append(excelUtils.validStandardType(standardType, listDict));
+            errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, true));
+            errMsg.append(excelUtils.validStandardType(standardType, listDict, true));
             errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(draftPlannedCompleteDateString, "草稿计划完成日期"));
             errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
             errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(planApprovalDateString, "计划报批日期"));
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 e33ba514..ef4840a4 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
@@ -245,10 +245,14 @@ public class ExcelUtils {
         return textValue.toString();
     }
 
-    public String validStandardType(String value, List<SysDictItemCore> listDict) {
+    public String validStandardType(String value, List<SysDictItemCore> listDict, boolean mustInput) {
         // 非空检查
         if (StrUtil.isBlank(value)) {
-            return "'标准类型'不能为空。";
+            if (mustInput) {
+                return "'标准类型'不能为空。";
+            } else {
+                return "";
+            }
         }
         // 检查授权部门
         if (!excelUtils.validDict("esp_standard_type", value, null, null, true, listDict)) {
@@ -259,6 +263,10 @@ public class ExcelUtils {
 
     public String validAuthDept(String authDept, List<SysDictItemCore> listDict,
                                 String standardClassification, Map<String, List<String>> authDeptMap) {
+        if (StrUtil.isBlank(authDept) && StrUtil.isBlank(standardClassification)) {
+            return "";
+        }
+
         if (StrUtil.isBlank(standardClassification)) {
             return "'标准等级分类'不能为空。";
         }
@@ -365,9 +373,13 @@ public class ExcelUtils {
         return "";
     }
 
-    public String validStandardSystem(String value, List<SysDictItemCore> listDict) {
+    public String validStandardSystem(String value, List<SysDictItemCore> listDict, boolean mustInput) {
         if (StrUtil.isBlank(value)) {
-            return "'标准体系'不能为空。";
+            if (mustInput) {
+                return "'标准体系'不能为空。";
+            } else {
+                return "";
+            }
         }
         // 检查主起草人
         if (!excelUtils.validDict("node_name", value, "laws_tree_node", "id", false, listDict)) {
@@ -414,9 +426,13 @@ public class ExcelUtils {
         return "";
     }
 
-    public String validPartName(String value, List<SysDictItemCore> listDict) {
+    public String validPartName(String value, List<SysDictItemCore> listDict, boolean mustInput) {
         if (StrUtil.isBlank(value)) {
-            return "零部件名称不能为空。";
+            if (mustInput) {
+                return "'零部件名称'不能为空。";
+            } else {
+                return "";
+            }
         }
         // 检查工作组
         if (!excelUtils.validDict("part_name", value, null, null, true, listDict)) {