From 9073998e5965e46dc56ac0179cd6734d4faa9ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 5 Apr 2022 14:40:57 +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 | 14 ++++++++++++++ .../com/xm/core/ctrl/XmQuestionController.java | 14 ++++++++++++++ .../java/com/xm/core/ctrl/XmTaskController.java | 15 +++++++++++++++ .../java/com/xm/core/service/XmMenuService.java | 4 ++++ .../com/xm/core/service/XmQuestionService.java | 4 ++++ .../java/com/xm/core/service/XmTaskService.java | 4 ++++ .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 11 +++++++++++ .../mapper/xm/core/dao/XmQuestionMapper.xml | 12 ++++++++++++ .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 12 ++++++++++++ 9 files changed, 90 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 c957a9a0..bcf15d1c 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 @@ -210,6 +210,20 @@ public class XmMenuController { return ResponseHelper.ok("成功",datas); } + @RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET) + public Map getXmMenuSort( @RequestParam Map xmMenu){ + User user=LoginUtils.getCurrentUserInfo(); + PageUtils.startPage(xmMenu); + xmMenu.put("branchId",user.getBranchId()); + List> datas= this.xmMenuService.getXmMenuSort(xmMenu); + Map m=new HashMap<>(); + PageUtils.responePage(m,datas); + m.put("data",datas); + Tips tips=new Tips("查询成功"); + m.put("tips", tips); + return m; + } + @RequestMapping(value="/listWithPhase",method=RequestMethod.GET) public Map listWithPhase( @RequestParam Map xmMenu){ Map m = new HashMap<>(); 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 583e033e..fc0369dd 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 @@ -1,6 +1,7 @@ package com.xm.core.ctrl; import com.alibaba.fastjson.JSON; +import com.github.pagehelper.Page; import com.mdp.audit.log.client.annotation.AuditLog; import com.mdp.audit.log.client.annotation.OperType; import com.mdp.core.entity.Tips; @@ -135,6 +136,19 @@ public class XmQuestionController { return ResponseHelper.ok("成功",datas); } + @RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET) + public Map getXmQuestionSort( @RequestParam Map xmQuestion){ + User user=LoginUtils.getCurrentUserInfo(); + PageUtils.startPage(xmQuestion); + xmQuestion.put("branchId",user.getBranchId()); + List> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion); + Map m=new HashMap<>(); + PageUtils.responePage(m,datas); + m.put("data",datas); + Tips tips=new Tips("查询成功"); + m.put("tips", tips); + return m; + } @ApiOperation( value = "新增一条xm_question信息",notes="addXmQuestion,主键如果为空，后台自动生成") @ApiResponses({ 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 994d4fc8..ba8917dd 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 @@ -296,6 +296,21 @@ public class XmTaskController { List> datas= this.xmTaskService.getXmTaskAgeDist(xmTask); return ResponseHelper.ok("成功",datas); } + + + @RequestMapping(value="/getXmTaskSort",method=RequestMethod.GET) + public Map getXmTaskSort( @RequestParam Map xmTask){ + User user=LoginUtils.getCurrentUserInfo(); + PageUtils.startPage(xmTask); + xmTask.put("branchId",user.getBranchId()); + List> datas= this.xmTaskService.getXmTaskSort(xmTask); + Map m=new HashMap<>(); + PageUtils.responePage(m,datas); + m.put("data",datas); + Tips tips=new Tips("查询成功"); + m.put("tips", tips); + return m; + } /***/ @ApiOperation( value = "根据主键批量修改修改任务中的某些字段信息",notes="editXmMenu") @ApiResponses({ diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index 928e3d43..7e8c80b3 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -414,5 +414,9 @@ public class XmMenuService extends BaseService { public List> getXmMenuAgeDist(Map xmMenu) { return super.selectList("getXmMenuAgeDist",xmMenu); } + + public List> getXmMenuSort(Map xmMenu) { + return super.selectList("getXmMenuSort",xmMenu); + } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index c076f469..fbfd9be1 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -208,5 +208,9 @@ public class XmQuestionService extends BaseService { public List> getXmQuestionAgeDist(Map xmQuestion) { return super.selectList("getXmQuestionAgeDist",xmQuestion); } + + public List> getXmQuestionSort(Map xmQuestion) { + return super.selectList("getXmQuestionSort",xmQuestion); + } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index c76ece9c..d3eb7c51 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -752,5 +752,9 @@ public class XmTaskService extends BaseService { public List> getXmTaskAgeDist(Map xmTask) { return super.selectList("getXmTaskAgeDist",xmTask); } + + public List> getXmTaskSort(Map xmTask) { + return super.selectList("getXmTaskSort",xmTask); + } } 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 eb5273de..292ff9b8 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 @@ -253,6 +253,17 @@ ) as a group by name + + 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 80e5c36e..88da72ff 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 @@ -110,6 +110,18 @@ ) as a group by name + 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 88a6af14..0c603a2b 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 @@ -440,6 +440,18 @@ ) as a group by name + +