fix(企标稽查流程): 81090

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<ProcessEsInspect> processEsInspectList) {
+        List<String> inspectIdList = new ArrayList<>();
         for (ProcessEsInspect processEsInspect : processEsInspectList) {
             ProcessEsInspect esInspect = processEsInspectService.getOne(
                     new LambdaQueryWrapper<ProcessEsInspect>()
@@ -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<EnterpriseStandardInspect> 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) {