diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index a963d1e5..3a6b494c 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -170,6 +170,8 @@ public class ResultCommon { public static final String ASSESS_DELETE_ERROR = "assess.delete.error"; //项目中有评估中的数据时,不允许删除 public static final String ASSESS_DELETE_ERROR2 = "assess.delete.error2"; + //法规符合性排查流程有正在进行中的流程,不允许删除 + public static final String SCC_DELETE_STANDARD_ERROR = "scc.delete.standard.error"; // 流程已分发,禁止驳回 public static final String PROCESS_ALREADY_DISTRIBUTED = "process.already.distributed"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index b4f5891d..7f9d793d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -15,8 +15,10 @@ import com.jero.common.util.MessageUtils; import com.jero.common.util.ZipUtil; import com.jero.common.util.obs.ObsBootUtil; import com.jero.modules.activiti.common.ActivitiCommon; +import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessNode; +import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; @@ -35,6 +37,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.Witho import com.jero.modules.activiti.process.standardComplianceCheck.mapper.ProcessStandardComplianceCheckMapper; import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService; import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService; +import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; @@ -43,6 +46,7 @@ import com.jero.modules.laws.common.service.impl.LawsCommonServiceImpl; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; import com.jero.modules.laws.enterprise.util.BeanCopyUtils; +import com.jero.modules.laws.standard.service.DoNotSplitStandardProvider; import com.jero.modules.laws.utils.ExcelExportUtilPro; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -95,7 +99,7 @@ import static com.jero.modules.activiti.process.standardComplianceCheck.common.P @Service @Slf4j public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl - implements IProcessStandardComplianceCheckService { + implements IProcessStandardComplianceCheckService, DoNotSplitStandardProvider { @Resource private IProcessHandleService processHandleService; @@ -127,6 +131,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl getDoNotDeleteStandardIdList() { + List list = list(); + List collect = + list.stream().filter(e -> StrUtil.isNotBlank(e.getStandardId())).collect(Collectors.toList()); + // 去流程主表判断对应的流程是否已经结束 + List prcIdList = collect.stream().map(ProcessStandardComplianceCheck::getProcessInstanceId) + .collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProcessAll::getProcessInstanceId, prcIdList); + wrapper.eq(ProcessAll::getPrcStatus, FinishFlagEnum.INCOMPLETE.getValue()); + // 未完成的流程 + List incompleteList = paService.list(wrapper); + return collect.stream().filter(e -> incompleteList.stream() + .noneMatch(i -> i.getProcessInstanceId().equals(e.getProcessInstanceId()))) + .map(ProcessStandardComplianceCheck::getStandardId) + .collect(Collectors.toList()); + } + + @Override + public String getResultCommon() { + return ResultCommon.SCC_DELETE_STANDARD_ERROR; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml index 424d6afe..be2926fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml @@ -18,23 +18,18 @@