ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 81953 企标计划立项--修订--发起节点提交需要调整唯一性校验

Browse Source
This commit is contained in:
mzaxd
2024-02-23 11:24:04 +08:00
parent 427df4d803
commit c61e9aae81
7 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java
+8 -2
View File
@@ -2,7 +2,9 @@ package com.jero.modules.activiti.process.esInitChange.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.enums.ProcessStatusEnum;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
@@ -78,10 +80,14 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
processEsInitChange.setId(null);
processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
processEsInitChange.setChangeStatus(ESPChangeType.ADD.getValue());
if (ESPProjectType.MODIFY.getValue().equals(projectType))
if (ESPProjectType.MODIFY.getValue().equals(projectType)) {
processEsInitChange.setApplicationCategory(ESPProjectType.MODIFY.getValue());
else
if (!esUtil.verifyEnStandardNumber(processEsInitChanges.get(0).getNewEnStandardNo())) {
throw new JeroBootException(ResultCommon.NEW_EN_STANDARD_NUMBER_CONFLICT);
}
} else {
processEsInitChange.setApplicationCategory(ESPProjectType.ENACT.getValue());
}
// 设置企业标准代号字段值
processEsInitChange.setEnStandardCode(esUtil.getEnStandardCode(processEsInitChange.getNewEnStandardNo()));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+5
View File
@@ -370,6 +370,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
throw new JeroBootException(ResultCommon.EN_STANDARD_NUMBER_CONFLICT);
}
}
if (initChange.getProjectType().equals(ESPProjectType.MODIFY.getValue())) {
if (!esUtil.verifyEnStandardNumber(initChange.getNewEnStandardNo())) {
throw new JeroBootException(ResultCommon.NEW_EN_STANDARD_NUMBER_CONFLICT);
}
}
}
public void startRunTask(InitChangeDataVO initChangeData) {