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 a3a18346..583e033e 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 @@ -117,9 +117,25 @@ public class XmQuestionController { m.put("tips", tips); return m; } - - - + + + @RequestMapping(value="/getXmQuestionAttDist",method=RequestMethod.GET) + public Map getXmQuestionAttDist( @RequestParam Map xmQuestion){ + User user=LoginUtils.getCurrentUserInfo(); + xmQuestion.put("branchId",user.getBranchId()); + List> datas= this.xmQuestionService.getXmQuestionAttDist(xmQuestion); + return ResponseHelper.ok("成功",datas); + } + + @RequestMapping(value="/getXmQuestionAgeDist",method=RequestMethod.GET) + public Map getXmQuestionAgeDist( @RequestParam Map xmQuestion){ + User user=LoginUtils.getCurrentUserInfo(); + xmQuestion.put("branchId",user.getBranchId()); + List> datas= this.xmQuestionService.getXmQuestionAgeDist(xmQuestion); + return ResponseHelper.ok("成功",datas); + } + + @ApiOperation( value = "新增一条xm_question信息",notes="addXmQuestion,主键如果为空,后台自动生成") @ApiResponses({ @ApiResponse(code = 200,response=XmQuestion.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") 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 2bd8bda4..994d4fc8 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 @@ -281,7 +281,21 @@ public class XmTaskController { m.put("tips", tips); return m; } + @RequestMapping(value="/getXmTaskAttDist",method=RequestMethod.GET) + public Map getXmTaskAttDist( @RequestParam Map xmTask){ + User user=LoginUtils.getCurrentUserInfo(); + xmTask.put("branchId",user.getBranchId()); + List> datas= this.xmTaskService.getXmTaskAttDist(xmTask); + return ResponseHelper.ok("成功",datas); + } + @RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET) + public Map getXmTaskAgeDist( @RequestParam Map xmTask){ + User user=LoginUtils.getCurrentUserInfo(); + xmTask.put("branchId",user.getBranchId()); + List> datas= this.xmTaskService.getXmTaskAgeDist(xmTask); + return ResponseHelper.ok("成功",datas); + } /***/ @ApiOperation( value = "根据主键批量修改修改任务中的某些字段信息",notes="editXmMenu") @ApiResponses({ 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 1000133b..c076f469 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 @@ -200,5 +200,13 @@ public class XmQuestionService extends BaseService { public void editSomeFields(Map xmMenuMap) { super.update("editSomeFields",xmMenuMap); } + + public List> getXmQuestionAttDist(Map xmQuestion) { + return super.selectList("getXmQuestionAttDist",xmQuestion); + } + + public List> getXmQuestionAgeDist(Map xmQuestion) { + return super.selectList("getXmQuestionAgeDist",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 46095471..c76ece9c 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 @@ -744,5 +744,13 @@ public class XmTaskService extends BaseService { public void batchUpdateBudgetWorkloadAndRate(List ids,BigDecimal budgetWorkload) { super.update("batchUpdateBudgetWorkloadAndRate",map("ids",ids,"budgetWorkload",budgetWorkload)); } + + public List> getXmTaskAttDist(Map xmTask) { + return super.selectList("getXmTaskAttDist",xmTask); + } + + public List> getXmTaskAgeDist(Map xmTask) { + return super.selectList("getXmTaskAgeDist",xmTask); + } } 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 c09718cc..80e5c36e 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 @@ -88,6 +88,28 @@ #{item} + + + + 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 eafc05de..88a6af14 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 @@ -419,6 +419,27 @@ #{item} + + +