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 processInfoVO) { // 第一个节点业务数据处理 @@ -252,6 +258,15 @@ public class EsRevisionServiceImpl extends ServiceImpl variables = JSON.parseObject(data.getBusinessJson(), Map.class); + String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER); + LambdaQueryWrapper 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); }