2.0

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

@@ -144,22 +144,27 @@ public class XmQuestionController {
 	public Result getXmQuestionAgeDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(params);
-		return Result.ok("ok","成功",datas);
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmQuestion> qw=QueryTools.initQueryWrapper(XmQuestion.class,params);
+		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(page,qw,params);
+		return Result.ok("ok","成功").setData(datas).setTotal(datas.size());
 	}
 	@RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET)
 	public Result getXmQuestionRetestDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(params);
-		return Result.ok("ok","成功",datas);
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmQuestion> qw=QueryTools.initQueryWrapper(XmQuestion.class,params);
+		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(page,qw,params);
+		return Result.ok("ok","成功").setData(datas).setTotal(page.getTotal());
 	}
 	@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
 	public Result getXmQuestionSort(@ApiIgnore @RequestParam Map<String,Object> params){
-		User user=LoginUtils.getCurrentUserInfo();		
-		IPage page=QueryTools.initPage(params);
+		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(params);
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmQuestion> qw=QueryTools.initQueryWrapper(XmQuestion.class,params);
+		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(page,qw,params);
 		Map<String,Object> m=new HashMap<>();
 		return Result.ok().setData(datas).setTotal(page.getTotal());
 	}

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

@@ -207,12 +207,12 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
 		return baseMapper.getXmQuestionAttDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
     }
 
-	public List<Map<String, Object>> getXmQuestionAgeDist(Map<String, Object> params) {
-		return baseMapper.getXmQuestionAgeDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+	public List<Map<String, Object>> getXmQuestionAgeDist(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmQuestionAgeDist(page,qw,ext);
 	}
 
-	public List<Map<String, Object>> getXmQuestionSort(Map<String, Object> params) {
-		return baseMapper.getXmQuestionSort(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+	public List<Map<String, Object>> getXmQuestionSort(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmQuestionSort(page,qw,ext);
 	}
 
 	@Override
@@ -220,8 +220,8 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
 		return "Q"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
 	}
 
-    public List<Map<String, Object>> getXmQuestionRetestDist(Map<String, Object> params) {
-		return baseMapper.getXmQuestionRetestDist(QueryTools.initPage(params),QueryTools.initQueryWrapper(XmMenu.class,params),params);
+    public List<Map<String, Object>> getXmQuestionRetestDist(IPage page, QueryWrapper qw, Map<String,Object> ext) {
+		return baseMapper.getXmQuestionRetestDist(page,qw,ext);
     }
 }