From eec71ae6a84405252ec135ddc1fc22c560dec710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 20 Feb 2022 01:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/PubTool.java | 8 ++++++++ .../main/java/com/xm/core/ctrl/XmMenuController.java | 10 ++++------ .../com/xm/core/ctrl/XmProjectPhaseController.java | 4 ++-- .../main/java/com/xm/core/ctrl/XmTaskController.java | 7 +++---- 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 xm-core/src/main/java/com/xm/core/PubTool.java diff --git a/xm-core/src/main/java/com/xm/core/PubTool.java b/xm-core/src/main/java/com/xm/core/PubTool.java new file mode 100644 index 00000000..49189126 --- /dev/null +++ b/xm-core/src/main/java/com/xm/core/PubTool.java @@ -0,0 +1,8 @@ +package com.xm.core; + +public class PubTool { + + public static String getPidPaths(String pidPahts, String trimId){ + return pidPahts.substring(0,pidPahts.indexOf(trimId+",")); + } +} diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 49d6fb7b..7eae7731 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -9,6 +9,7 @@ import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.PubTool; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmProjectPhase; import com.xm.core.entity.XmTask; @@ -94,8 +95,7 @@ public class XmMenuController { List> xmMenuList = xmMenuService.selectListMapByWhere(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ - List pidPathsList=xmMenuList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmMenuList.stream().map(i-> PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("menuId"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsList)); xmMenuList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); @@ -132,8 +132,7 @@ public class XmMenuController { List> xmMenuList = xmMenuService.selectListMapByWhereWithState(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ - List pidPathsList=xmMenuList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmMenuList.stream().map(i-> PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("menuId"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsList)); xmMenuList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); @@ -156,8 +155,7 @@ public class XmMenuController { List> xmMenuList = xmMenuService.selectListMapByWhereWithPlan(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ - List pidPathsList=xmMenuList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmMenuList.stream().map(i-> PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("menuId"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmMenuService.selectListMapByWhereWithPlan(map("pidPathsList",pidPathsList)); xmMenuList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index c5e9c7c9..18666f7e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -10,6 +10,7 @@ import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.PubTool; import com.xm.core.entity.XmProjectPhase; import com.xm.core.entity.XmTask; import com.xm.core.service.XmProjectGroupService; @@ -117,8 +118,7 @@ public class XmProjectPhaseController { List> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表 PageUtils.responePage(m, xmProjectPhaseList); if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop"))){ - List pidPathsList=xmProjectPhaseList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmProjectPhaseList.stream().map(i-> PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("id"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsList)); xmProjectPhaseList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 294d0b4a..2e76fa36 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -14,6 +14,7 @@ import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.PubTool; import com.xm.core.entity.XmTask; import com.xm.core.service.XmProjectGroupService; import com.xm.core.service.XmRecordService; @@ -142,8 +143,7 @@ public class XmTaskController { List> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList); if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){ - List pidPathsList=xmTaskVoList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmTaskVoList.stream().map(i->PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("id"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsList)); xmTaskVoList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); @@ -227,8 +227,7 @@ public class XmTaskController { xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList); if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){ - List pidPathsList=xmTaskVoList.stream().map(i->(String)i.get("pidPaths")).collect(Collectors.toSet()).stream().collect(Collectors.toList()); - pidPathsList=pidPathsList.stream().map(i->i.substring(0,i.length()-2)).collect(Collectors.toList()); + List pidPathsList=xmTaskVoList.stream().map(i-> PubTool.getPidPaths((String)i.get("pidPaths"),(String)i.get("id"))).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsList)); xmTaskVoList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());