From 05b4cce7c6626710e104cc61c4842abb1cfdb4b7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 10 Oct 2024 14:25:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=20=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/annualinit/common/ProcessAnnualInitCommon.java   | 5 +++++
 .../annualinit/service/ProcessAnnualInitLinkService.java     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java
index 12acc948..73473cb8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java
@@ -33,5 +33,10 @@ public class ProcessAnnualInitCommon {
     public static final String CHIEF_INSPECTOR_LIST = "chiefInspectorList";
     //授权人
     public static final String AUTHORIZED_PERSON_LIST = "authorizedPersonList";
+    //制订
+    public static final String FORMULATE = "1";
+    //修订
+    public static final String REVISE = "2";
+
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
index 26fbf9be..5936b1cc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
@@ -8,6 +8,7 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.util.PasswordUtil;
+import com.jero.modules.activiti.process.annualinit.common.ProcessAnnualInitCommon;
 import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink;
 import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitLinkMapper;
 import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitLinkExcelVO;
@@ -182,7 +183,7 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
             String standardNumber = excelVO.getStandardNumber();
             if (StringUtils.isBlank(standardNumber)){
                 msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
-            }else {
+            }else if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
                 LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
                 if (lawsEnterpriseStandard != null){
                     excelVO.setStandardId(lawsEnterpriseStandard.getId());