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

fix: 81992 年度制修订计划（标准化归档） 流程阻塞

Browse Source
This commit is contained in:
mzaxd
2024-02-23 16:04:16 +08:00
parent 9a27db6de7
commit fbe92e9bbf
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java
+5 -3
View File
@@ -95,9 +95,11 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
needValidList.add(esp); needValidList.add(esp);
} }
} }
List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); if (!needValidList.isEmpty()) {
if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList);
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后，与已存在的企标编号重复，请删除后重新提交"); if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) {
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后，与已存在的企标编号重复，请删除后重新提交");
}
} }
// 判断修订的新标准号是否有效 // 判断修订的新标准号是否有效
for (EnterpriseStandardPlan esp : enterpriseStandardPlans) { for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java
+5 -3
View File
@@ -80,9 +80,11 @@ public class ProcessESAnnualReportEndListener implements ExecutionListener {
needValidList.add(esp); needValidList.add(esp);
} }
} }
List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); if (!needValidList.isEmpty()) {
if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList);
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后，与已存在的企标编号重复，请删除后重新提交"); if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) {
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后，与已存在的企标编号重复，请删除后重新提交");
}
} }
// 判断修订的新标准号是否有效 // 判断修订的新标准号是否有效
for (EnterpriseStandardPlan esp : enterpriseStandardPlans) { for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {