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 setVariables(String id) { ProcessEsInitChange initChange = getById(id); @@ -70,6 +74,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl 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 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; + } }