From 9810c69878e2551c3cbe423adc7301864d5f674c Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 23 Jan 2024 13:45:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2081090?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsInspectFlowServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index aecf3822..699e5254 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -202,6 +202,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { } private void duplicateCheck(List processEsInspectList) { + List inspectIdList = new ArrayList<>(); for (ProcessEsInspect processEsInspect : processEsInspectList) { ProcessEsInspect esInspect = processEsInspectService.getOne( new LambdaQueryWrapper() @@ -213,10 +214,17 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") .or().isNull(ProcessDraft::getSaveSource))); if (size == 0){ - throw new JeroBootException("稽查计划企标不可重复发起!"); + inspectIdList.add(processEsInspect.getInspectId()); } } } + if (!inspectIdList.isEmpty()){ + List enterpriseStandardInspectList = enterpriseStandardInspectService.listByIds(inspectIdList); + if (!enterpriseStandardInspectList.isEmpty()){ + String errorMsg = enterpriseStandardInspectList.stream().map(EnterpriseStandardInspect::getInspectNo).collect(Collectors.joining(",")); + throw new JeroBootException("稽查依据标准号为：" + errorMsg +"的稽查计划企标不可重复发起!"); + } + } } private void handleReportAndRectifyPlan(ProcessAll processAll, ProcessEsInspect processEsInspect) {