From 24beda9393b4d77c1159eb2c14986ba176f598c6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 18 May 2023 17:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9=E4=BA=A4=E4=BB=98?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=A8=8B=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProcessInfoEOServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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);