From 89c01d87c288420e468b81560c432368de681e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 28 Apr 2022 02:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrl/XmTaskSbillDetailController.java | 70 +++++++++++++++++-- .../service/XmTaskSbillDetailService.java | 13 ++++ .../xm/core/dao/XmTaskSbillDetailMapper.xml | 28 +++++++- 3 files changed, 105 insertions(+), 6 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index b9c624c4..9f9a49aa 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -71,6 +71,8 @@ public class XmTaskSbillDetailController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmTaskSbillDetail, "ids"); PageUtils.startPage(xmTaskSbillDetail); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskSbillDetail.put("branchId",user.getBranchId()); List> xmTaskSbillDetailList = xmTaskSbillDetailService.selectListMapByWhere(xmTaskSbillDetail); //列出XmTaskSbillDetail列表 PageUtils.responePage(m, xmTaskSbillDetailList); m.put("data",xmTaskSbillDetailList); @@ -78,9 +80,69 @@ public class XmTaskSbillDetailController { m.put("tips", tips); return m; } - - - + @ApiOperation( value = "查询个人支出费用按月分布报表",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/listSumSamtGroupByUseridBizMonth",method=RequestMethod.GET) + public Map listSumSamtGroupByUseridBizMonth( @RequestParam Map xmTaskSbillDetail){ + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); + String bizYear= (String) xmTaskSbillDetail.get("bizYear"); + if(!StringUtils.hasText(bizYear)){ + return ResponseHelper.failed("bizYear-0","年份不能为空"); + } + User user=LoginUtils.getCurrentUserInfo(); + xmTaskSbillDetail.put("branchId",user.getBranchId()); + List> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByUseridBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表 + + m.put("data",xmTaskSbillDetailList); + + m.put("tips", tips); + return m; + } + @ApiOperation( value = "查询项目支出费用按月分布报表",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/listSumSamtGroupByProjectIdBizMonth",method=RequestMethod.GET) + public Map listSumSamtGroupByProjectIdBizMonth( @RequestParam Map xmTaskSbillDetail){ + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); + String bizYear= (String) xmTaskSbillDetail.get("bizYear"); + if(!StringUtils.hasText(bizYear)){ + return ResponseHelper.failed("bizYear-0","年份不能为空"); + } + User user=LoginUtils.getCurrentUserInfo(); + xmTaskSbillDetail.put("branchId",user.getBranchId()); + List> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表 + + m.put("data",xmTaskSbillDetailList); + + m.put("tips", tips); + return m; + } + @ApiOperation( value = "查询机构支出费用按月分布报表",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200,response=XmTaskSbillDetail.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/listSumSamtGroupByBranchIdBizMonth",method=RequestMethod.GET) + public Map listSumSamtGroupByBranchIdBizMonth( @RequestParam Map xmTaskSbillDetail){ + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); + String bizYear= (String) xmTaskSbillDetail.get("bizYear"); + if(!StringUtils.hasText(bizYear)){ + return ResponseHelper.failed("bizYear-0","年份不能为空"); + } + User user=LoginUtils.getCurrentUserInfo(); + xmTaskSbillDetail.put("branchId",user.getBranchId()); + List> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表 + + m.put("data",xmTaskSbillDetailList); + + m.put("tips", tips); + return m; + } /** @ApiOperation( value = "新增一条工时登记表信息",notes=" ") @ApiResponses({ @@ -155,8 +217,6 @@ public class XmTaskSbillDetailController { } */ - - @ApiOperation( value = "批量修改某些字段",notes="") @ApiResponses({ @ApiResponse(code = 200,response=XmTaskSbillDetail.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java index ae0a91e8..11b5487e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java @@ -101,5 +101,18 @@ public class XmTaskSbillDetailService extends BaseService { } + + + public List> listSumSamtGroupByUseridBizMonth(Map xmTaskSbillDetail) { + return super.selectList("listSumSamtGroupByUseridBizMonth",xmTaskSbillDetail); + } + + public List> listSumSamtGroupByProjectIdBizMonth(Map xmTaskSbillDetail) { + return super.selectList("listSumSamtGroupByProjectIdBizMonth",xmTaskSbillDetail); + } + + public List> listSumSamtGroupByBranchIdBizMonth(Map xmTaskSbillDetail) { + return super.selectList("listSumSamtGroupByBranchIdBizMonth",xmTaskSbillDetail); + } } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml index f2680a2d..7399b939 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml @@ -12,7 +12,8 @@ - + and biz_date like concat(#{bizYear},'%') + + + + +