From 41caa2549afcf568f4e2583a3f0d974848c206cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 9 Nov 2023 13:37:22 +0800 Subject: [PATCH] 2.0 --- .../com/xm/core/ctrl/XmMenuController.java | 17 ++++++++----- .../xm/core/ctrl/XmQuestionController.java | 3 ++- .../com/xm/core/ctrl/XmTaskController.java | 7 +++--- .../java/com/xm/core/mapper/XmTaskMapper.java | 2 +- .../com/xm/core/service/XmMenuService.java | 24 +++++-------------- .../com/xm/core/service/XmTaskService.java | 4 ++-- 6 files changed, 25 insertions(+), 32 deletions(-) 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 0dc1e207..2096c225 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 @@ -204,15 +204,19 @@ public class XmMenuController { @RequestMapping(value="/getXmMenuAttDist",method=RequestMethod.GET) public Result getXmMenuAttDist(@ApiIgnore @RequestParam Map params){ this.paramsInit(params); - List> datas= this.xmMenuService.getXmMenuAttDist(params); - return Result.ok("ok","成功",datas); + IPage page=QueryTools.initPage(params); + QueryWrapper qw=QueryTools.initQueryWrapper(XmMenu.class,params); + List> datas= this.xmMenuService.getXmMenuAttDist(page,qw,params); + return Result.ok("ok","成功").setData(datas).setTotal(page.getTotal()); } @RequestMapping(value="/getXmMenuAgeDist",method=RequestMethod.GET) public Result getXmMenuAgeDist(@ApiIgnore @RequestParam Map params){ this.paramsInit(params); - List> datas= this.xmMenuService.getXmMenuAgeDist(params); - return Result.ok("ok","成功",datas); + IPage page=QueryTools.initPage(params); + QueryWrapper qw=QueryTools.initQueryWrapper(XmMenu.class,params); + List> datas= this.xmMenuService.getXmMenuAgeDist(page,qw,params); + return Result.ok("ok","成功").setData(datas).setTotal(datas.size()); } @RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET) @@ -220,8 +224,9 @@ public class XmMenuController { IPage page=QueryTools.initPage(params); this.paramsInit(params); - List> datas= this.xmMenuService.getXmMenuSort(params); - return Result.ok().setData(datas); + QueryWrapper qw=QueryTools.initQueryWrapper(XmMenu.class,params); + List> datas= this.xmMenuService.getXmMenuSort(page,qw,params); + return Result.ok().setData(datas).setTotal(page.getTotal()); } /***/ 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 07bb5fbd..525af947 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 @@ -135,8 +135,9 @@ public class XmQuestionController { public Result getXmQuestionAttDist(@ApiIgnore @RequestParam Map params){ User user=LoginUtils.getCurrentUserInfo(); params.put("pbranchId",user.getBranchId()); + IPage page=QueryTools.initPage(params); List> datas= this.xmQuestionService.getXmQuestionAttDist(params); - return Result.ok("ok","成功",datas); + return Result.ok("ok","成功").setData(datas).setTotal(page.getTotal()); } @RequestMapping(value="/getXmQuestionAgeDist",method=RequestMethod.GET) 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 bcb99133..d1315146 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 @@ -204,7 +204,7 @@ public class XmTaskController { IPage page=QueryTools.initPage(params); QueryWrapper qw = QueryTools.initQueryWrapper(XmTask.class , params); List> datas= this.xmTaskService.getXmTaskAttDist(page,qw,params); - return Result.ok("ok","成功",datas); + return Result.ok("ok","成功").setData(datas).setTotal(page.getTotal()); } @RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET) @@ -212,10 +212,9 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); params.put("pbranchId",user.getBranchId()); - IPage page=QueryTools.initPage(params); QueryWrapper qw = QueryTools.initQueryWrapper(XmTask.class , params); - List> datas= this.xmTaskService.getXmTaskAgeDist(page,qw,params); - return Result.ok("ok","成功",datas); + List> datas= this.xmTaskService.getXmTaskAgeDist(qw,params); + return Result.ok("ok","成功").setData(datas).setTotal(datas.size()); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java index 39cda5dc..941e3667 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java @@ -40,7 +40,7 @@ public interface XmTaskMapper extends BaseMapper { List> getXmTaskAttDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmTaskAgeDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> getXmTaskAgeDist(@Param("ew") QueryWrapper ew,@Param("ext") Map ext); void upBrowseTimes(Map map); 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 8a388211..b00309ec 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 @@ -3,7 +3,6 @@ package com.xm.core.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.entity.Tips; -import com.mdp.core.query.QueryTools; import com.mdp.core.service.BaseService; import com.xm.core.entity.XmMenu; import com.xm.core.mapper.XmMenuMapper; @@ -60,17 +59,6 @@ public class XmMenuService extends BaseService { return baseMapper.selectListMapByWhereWithState(page,ew,ext); } - /** - * 连同功能关联的产品计划一并带出 - * - * @param params - * @return - */ - public List> selectListMapByWhereWithPhase(Map params) { - - return baseMapper.selectListMapByWhereWithPhase( QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); - } - public void updateMenuChildrenCntByMenuId(String menuId) { baseMapper.updateMenuChildrenCntByMenuId( menuId); @@ -400,16 +388,16 @@ public class XmMenuService extends BaseService { } - public List> getXmMenuAttDist(Map params) { - return baseMapper.getXmMenuAttDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); + public List> getXmMenuAttDist(IPage page, QueryWrapper qw, Map ext) { + return baseMapper.getXmMenuAttDist(page,qw,ext); } - public List> getXmMenuAgeDist(Map params) { - return baseMapper.getXmMenuAgeDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); + public List> getXmMenuAgeDist(IPage page, QueryWrapper qw, Map ext) { + return baseMapper.getXmMenuAgeDist(page,qw,ext); } - public List> getXmMenuSort(Map params) { - return baseMapper.getXmMenuSort(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params); + public List> getXmMenuSort(IPage page, QueryWrapper qw, Map ext) { + return baseMapper.getXmMenuSort(page,qw,ext); } @Override 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 cb6d40a6..bab1bc98 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 @@ -832,8 +832,8 @@ public class XmTaskService extends BaseService { return baseMapper.getXmTaskAttDist(page,ew,ext); } - public List> getXmTaskAgeDist(IPage page, QueryWrapper ew, Map ext) { - return baseMapper.getXmTaskAgeDist(page,ew,ext); + public List> getXmTaskAgeDist(QueryWrapper ew, Map ext) { + return baseMapper.getXmTaskAgeDist(ew,ext); } public List> getXmTaskSort(IPage page, QueryWrapper ew, Map ext) {