From 05f4057d33949edc51c48413b6d0bd32beec1d32 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 11 Oct 2023 15:08:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esInitChange/entity/ProcessEsInitChange.java    |  2 +-
 .../impl/ProcessEsInitChangeServiceImpl.java        | 13 +++++++++++++
 .../enterprise/util/EnterpriseStandardUtil.java     |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
index 01d594d9..3a08c860 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
@@ -124,12 +124,12 @@ public class ProcessEsInitChange implements Serializable {
     /**
      * 企业标准代号
      */
+    @NotBlank
     private String enStandardCode;
 
     /**
      * 企业名称代号
      */
-    @NotBlank
     private String enNameCode;
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index c845a32b..4626eb05 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESProjectType;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper;
+import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -32,6 +33,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
+    @Resource
+    private EnterpriseStandardUtil esUtil;
+
     @Override
     public Map<String, Object> setVariables(String id) {
         ProcessEsInitChange initChange = getById(id);
@@ -70,6 +74,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
 
     @Override
     public void startInitChange(List<ProcessEsInitChange> esInitChangeList) {
+        // 校验企标编号是否冲突
+        if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) {
+            throw new JeroBootException("企标编号冲突");
+        }
+
         String processDefinitionKey = "es-init-change";
         String userId = UserUtils.getUserId();
         // 保存到业务流程表
@@ -113,6 +122,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
 
     @Override
     public void approvalInitChange(String taskId, List<ProcessEsInitChange> esInitChangeList) {
+        // 校验企标编号是否冲突
+        if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) {
+            throw new JeroBootException("企标编号冲突");
+        }
         String userId = UserUtils.getUserId();
         // 更新业务流程数据
         saveOrUpdateBatch(esInitChangeList);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
index c6af796e..2f7a470d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
@@ -141,4 +141,8 @@ public class EnterpriseStandardUtil {
         return standardNo.substring(dashIndex - 4, dashIndex);
     }
 
+    public boolean verifyEnStandardNumber(String StandardNumber) {
+        // TODO 校验企标编号是否有效
+        return true;
+    }
 }