From da71f32611da05b90a235aaa6ead0bad182d6b10 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 25 Sep 2024 10:34:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=A4=E6=96=AD=E6=A0=87=E5=87=86=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessESRevisionEndListener.java    |  4 ----
 .../service/impl/EsRevisionServiceImpl.java       | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java
index 936d3696..cb059993 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java
@@ -10,7 +10,6 @@ import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionAdvi
 import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.tag.enums.TableNameEnum;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
@@ -29,9 +28,6 @@ import static com.jero.modules.laws.common.constant.FieldCommon.MAIN_DRAFT_USER;
 @Component
 public class ProcessESRevisionEndListener implements ExecutionListener {
 
-    @Resource
-    private EnterpriseStandardPlanService espService;
-
     @Resource
     private EsRevisionService esRevisionService;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
index e08441c2..8543b6bc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esRevisionAdvice.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.SendMessageAPI;
@@ -29,6 +30,8 @@ import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
 import com.jero.modules.laws.enterprise.entity.ESPProjectStatus;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -82,6 +85,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     @Resource
     private SendMessageAPI sendMessageAPI;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     @Override
     public void startProcess(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
         // 第一个节点业务数据处理
@@ -252,6 +258,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 String mainDraftUser = (String) taskService.getVariable(taskId, FieldCommon.MAIN_DRAFT_USER);
                 this.sendMessageToMainDraftUser(mainDraftUser, processInstanceId, maxBatchNum);
             case SET_STANDARD_NUMBER:
+                // 判断标准编号是否重复
+                Map<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class);
+                String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER);
+                LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LawsEnterpriseStandard::getStandardNumber, variables.get(FieldCommon.STANDARD_NUMBER));
+                LawsEnterpriseStandard one = esService.getOne(queryWrapper);
+                if (Objects.nonNull(one)) {
+                    throw new JeroBootException(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS);
+                }
                 // 保存数据
                 updateById(data);
         }