From 863084bf551185fa089c9b698f74501042b2a8ac 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 00:23:37 +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 --- .../java/com/xm/core/ctrl/XmMenuController.java | 3 +++ .../xm/core/ctrl/XmProjectPhaseController.java | 9 +++++++++ .../java/com/xm/core/ctrl/XmTaskController.java | 17 +++++++++++++++++ 3 files changed, 29 insertions(+) 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 c493f971..49d6fb7b 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 @@ -95,6 +95,7 @@ public class XmMenuController { 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> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsList)); xmMenuList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); @@ -132,6 +133,7 @@ public class XmMenuController { 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> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsList)); xmMenuList.addAll(parentList); m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); @@ -155,6 +157,7 @@ public class XmMenuController { 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> 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 d17ddaf3..c5e9c7c9 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 @@ -29,6 +29,8 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import static com.mdp.core.utils.BaseUtils.map; + /** * url编制采用rest风格,如对XM.xm_project_phase 项目计划模板的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectPhase/add
@@ -114,6 +116,13 @@ public class XmProjectPhaseController { PageUtils.startPage(xmProjectPhase); 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> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsList)); + xmProjectPhaseList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } m.put("data",xmProjectPhaseList); Tips tips=new Tips("查询成功"); m.put("tips", tips); 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 715b142a..294d0b4a 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 @@ -33,6 +33,8 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import static com.mdp.core.utils.BaseUtils.map; + /** * url编制采用rest风格,如对XM.xm_task xm_task的操作有增删改查,对应的url分别为:
* 新增: xm/xmTask/add
@@ -139,6 +141,14 @@ 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> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsList)); + xmTaskVoList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + m.put("data",xmTaskVoList); Tips tips=new Tips("查询成功"); m.put("tips", tips); @@ -216,6 +226,13 @@ public class XmTaskController { }else { 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> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsList)); + xmTaskVoList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } }