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

This commit is contained in:
2024-02-23 16:04:16 +08:00
parent 9a27db6de7
commit fbe92e9bbf
2 changed files with 10 additions and 6 deletions
@@ -95,10 +95,12 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
needValidList.add(esp); needValidList.add(esp);
} }
} }
if (!needValidList.isEmpty()) {
List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList);
if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) {
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交");
} }
}
// 判断修订的新标准号是否有效 // 判断修订的新标准号是否有效
for (EnterpriseStandardPlan esp : enterpriseStandardPlans) { for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {
// 制定生成新企标编号 // 制定生成新企标编号
@@ -80,10 +80,12 @@ public class ProcessESAnnualReportEndListener implements ExecutionListener {
needValidList.add(esp); needValidList.add(esp);
} }
} }
if (!needValidList.isEmpty()) {
List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); List<String> duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList);
if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) {
throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交");
} }
}
// 判断修订的新标准号是否有效 // 判断修订的新标准号是否有效
for (EnterpriseStandardPlan esp : enterpriseStandardPlans) { for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {
// 制定生成新企标编号 // 制定生成新企标编号