diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index bf4da2fb2..01c1ba96f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -409,13 +409,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl flowTypeList = new ArrayList<>(); // 区分重置设计、验证、全部流程 - if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){ + if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())) { flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue()); - }else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){ + flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue()); + flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue()); + } else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())) { flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); - }else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){ + flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue()); + } else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())) { flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue()); + flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue()); } // flowTypeList.add(FlowTypeEnum.RWQRLC.getValue()); // flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); @@ -424,10 +428,10 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl processInfoQueryWrap = new QueryWrapper<>(); - processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList); - processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType,flowTypeList); + processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryIdList); + processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList); List processInfoEOList = this.list(processInfoQueryWrap); - if(CollectionUtils.isNotEmpty(processInfoEOList)){ + if (CollectionUtils.isNotEmpty(processInfoEOList)) { List processInfoIdList = processInfoEOList.stream().map(ProcessInfoEO::getId).distinct().collect(Collectors.toList()); /*QueryWrapper detailRemoveWrap = new QueryWrapper<>(); detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,processInfoIdList);