2.0

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<String,Object> params){
  		this.paramsInit(params);
-		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAttDist(params);
-		return Result.ok("ok","成功",datas);
+ 		IPage page=QueryTools.initPage(params);
+ 		QueryWrapper<XmMenu> qw=QueryTools.initQueryWrapper(XmMenu.class,params);
+		List<Map<String,Object>> 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<String,Object> params){
 		this.paramsInit(params);
-		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuAgeDist(params);
-		return Result.ok("ok","成功",datas);
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmMenu> qw=QueryTools.initQueryWrapper(XmMenu.class,params);
+		List<Map<String,Object>> 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<Map<String,Object>> datas= this.xmMenuService.getXmMenuSort(params);
-		return Result.ok().setData(datas);
+		QueryWrapper<XmMenu> qw=QueryTools.initQueryWrapper(XmMenu.class,params);
+		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuSort(page,qw,params);
+		return Result.ok().setData(datas).setTotal(page.getTotal());
 	}
 
 	/***/

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -135,8 +135,9 @@ public class XmQuestionController {
 	public Result getXmQuestionAttDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
+		IPage page=QueryTools.initPage(params);
 		List<Map<String,Object>> 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)

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -204,7 +204,7 @@ public class XmTaskController {
 		IPage page=QueryTools.initPage(params);
 		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
 		List<Map<String,Object>> 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<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
-		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(page,qw,params);
-		return Result.ok("ok","成功",datas);
+		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(qw,params);
+		return Result.ok("ok","成功").setData(datas).setTotal(datas.size());
 	}
 
 

xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java

@@ -40,7 +40,7 @@ public interface XmTaskMapper extends BaseMapper<XmTask> {
 
     List<Map<String, Object>> getXmTaskAttDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
-    List<Map<String, Object>> getXmTaskAgeDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
+    List<Map<String, Object>> getXmTaskAgeDist(@Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
     void upBrowseTimes(Map<String, Object> map);
 

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<XmMenuMapper,XmMenu> {
 		return baseMapper.selectListMapByWhereWithState(page,ew,ext);
 	}
 
-	/**
-	 * 连同功能关联的产品计划一并带出
-	 *
-	 * @param params
-	 * @return
-	 */
-	public List<Map<String, Object>> selectListMapByWhereWithPhase(Map<String, Object> 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<XmMenuMapper,XmMenu> {
 
 	}
 
-    public List<Map<String,Object>> getXmMenuAttDist(Map<String, Object> params) {
-		return baseMapper.getXmMenuAttDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+    public List<Map<String,Object>> getXmMenuAttDist(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmMenuAttDist(page,qw,ext);
     }
 
-	public List<Map<String, Object>> getXmMenuAgeDist(Map<String, Object> params) {
-		return baseMapper.getXmMenuAgeDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+	public List<Map<String, Object>> getXmMenuAgeDist(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmMenuAgeDist(page,qw,ext);
 	}
 
-    public List<Map<String, Object>> getXmMenuSort(Map<String, Object> params) {
-		return baseMapper.getXmMenuSort(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+    public List<Map<String, Object>> getXmMenuSort(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmMenuSort(page,qw,ext);
     }
 
 	@Override

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -832,8 +832,8 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
 		return baseMapper.getXmTaskAttDist(page,ew,ext);
 	}
 
-	public List<Map<String, Object>> getXmTaskAgeDist(IPage page, QueryWrapper ew, Map<String,Object> ext) {
-		return baseMapper.getXmTaskAgeDist(page,ew,ext);
+	public List<Map<String, Object>> getXmTaskAgeDist(QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.getXmTaskAgeDist(ew,ext);
 	}
 
 	public List<Map<String, Object>> getXmTaskSort(IPage page, QueryWrapper ew, Map<String,Object> ext) {