From 896f70be7f6b47c53dc988c5278a08ac2ca65b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 17 Feb 2022 01:30:35 +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 --- .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 3 +++ .../main/java/com/xm/core/ctrl/XmMenuPlanController.java | 1 + .../main/java/com/xm/core/ctrl/XmQuestionController.java | 1 + .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 1 + .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 5 +++++ .../mybatis/mapper/xm/core/dao/XmQuestionMapper.xml | 5 +++++ .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 9 ++++++++- 7 files changed, 24 insertions(+), 1 deletion(-) 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 10e7dd97..dcc822b1 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 @@ -67,6 +67,7 @@ public class XmMenuController { public Map listXmMenu( @RequestParam Map xmMenu){ Map m = new HashMap<>(); RequestUtils.transformArray(xmMenu, "menuIds"); + RequestUtils.transformArray(xmMenu, "tagIdList"); PageUtils.startPage(xmMenu); String menuId= (String) xmMenu.get("menuId"); Object menuIds= xmMenu.get("menuIds"); @@ -96,6 +97,7 @@ public class XmMenuController { public Map listWithState( @RequestParam Map xmMenu){ Map m = new HashMap<>(); RequestUtils.transformArray(xmMenu, "menuIds"); + RequestUtils.transformArray(xmMenu, "tagIdList"); PageUtils.startPage(xmMenu); Tips tips=new Tips("查询成功"); String menuId= (String) xmMenu.get("menuId"); @@ -123,6 +125,7 @@ public class XmMenuController { public Map listWithPlan( @RequestParam Map xmMenu){ Map m = new HashMap<>(); RequestUtils.transformArray(xmMenu, "menuIds"); + RequestUtils.transformArray(xmMenu, "tagIdList"); PageUtils.startPage(xmMenu); Tips tips=new Tips("查询成功"); if(StringUtils.isEmpty(xmMenu.get("projectId"))) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index a5320fc7..c68cfe69 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -104,6 +104,7 @@ public class XmMenuPlanController { public Map listXmMenuPlan( @RequestParam Map xmMenuPlan){ Map m = new HashMap<>(); RequestUtils.transformArray(xmMenuPlan, "ids"); + RequestUtils.transformArray(xmMenuPlan, "tagIdList"); PageUtils.startPage(xmMenuPlan); List> xmMenuPlanList = xmMenuPlanService.selectListMapByWhere(xmMenuPlan); //列出XmMenuPlan列表 PageUtils.responePage(m, xmMenuPlanList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index 11787498..7beadd38 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -100,6 +100,7 @@ public class XmQuestionController { Map m = new HashMap<>(); RequestUtils.transformArray(xmQuestion, "ids"); RequestUtils.transformArray(xmQuestion, "menuIds"); + RequestUtils.transformArray(xmQuestion, "tagIdList"); PageUtils.startPage(xmQuestion); User user = LoginUtils.getCurrentUserInfo(); xmQuestion.put("compete",user.getUserid()); 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 4d32cee8..0deab05d 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 @@ -361,6 +361,7 @@ public class XmTaskController { public Map listXmTask( @RequestParam Map xmTask){ Map m = new HashMap<>(); RequestUtils.transformArray(xmTask, "ids"); + RequestUtils.transformArray(xmTask, "tagIdList"); PageUtils.startPage(xmTask); String taskOut= (String) xmTask.get("taskOut"); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 9a917277..bbb70cfb 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -11,6 +11,11 @@ ( #{item}) + and + + find_in_set(item,res.tag_ids) + + and not exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id) diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 41b761ed..a2a921b4 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -67,6 +67,11 @@ #{item} + and + + find_in_set(item,res.tag_ids) + + and exists (select 1 from xm_question_handle h where h.question_id = res.id and h.handler_userid=#{hisHandlerUserid} and handle_status=#{hisHandleStatus}) and res.create_time between #{createTimeStart} and #{createTimeEnd} and res.ltime between #{ltimeStart} and #{ltimeEnd} diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 20d6385e..2860ebe1 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -10,7 +10,14 @@ ( #{item}) - and res.create_time > #{createTimeStart} + + + and + + find_in_set(item,res.tag_ids) + + + and res.create_time > #{createTimeStart} and res.create_time < #{createTimeEnd} and (res.parent_taskid = '' or res.parent_taskid IS NULL)