From 9d7e80c668e85c0605258ad9fc87c565a22a32de Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 15 Sep 2021 09:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 45 ------ .../PayWorkingGroupStatisticsController.java | 139 ++++++++++++++++++ .../PayWorkingGroupSubItemController.java | 47 +----- .../xml/PayWorkingGroupSubItemMapper.xml | 12 ++ 4 files changed, 153 insertions(+), 90 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index bbbf1398..13337154 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -93,29 +93,6 @@ public class PayWorkingGroupController extends JeroController list2(PayWorkingGroupSearch payWorkingGroupSearch, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch); - double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney()==null ? "0" : t.getAllMoney())).sum(); - double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0" : t.getComeAllMoney())).sum(); - HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("分页集合",pageList); - objectObjectHashMap.put("总计应收总金额",sum); - objectObjectHashMap.put("总计实收总金额",sum2); - return Result.OK(objectObjectHashMap); - } /** * 列表查询 @@ -390,28 +367,6 @@ public class PayWorkingGroupController extends JeroController pageList = payWorkingGroupService.queryPageListForStatisticsExcel(); - return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class,"工作组项目统计"); - } - - - /** - * 获取工作组列表 - * - */ - @GetMapping(value = "/getGroupList") - @ApiOperation(value="获取工作组列表下拉框", notes="获取工作组列表下拉框") - public List getGroupList() { - List pageList = payWorkingGroupService.getGroupList(); - return pageList; - } /** * 通过excel导入数据 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java new file mode 100644 index 00000000..ee9973e3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java @@ -0,0 +1,139 @@ +package com.jero.project.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; +import com.jero.project.entity.PayWorkGroupSubletStatistics; +import com.jero.project.entity.PayWorkingGroupSearch; +import com.jero.project.entity.PayWorkingGroupStatistics; +import com.jero.project.entity.PayWorkingGroupSubletSearch; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.util.AmountUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.List; + +/** + * @author zql + * @date 2021/9/15 8:54 + */ +@Api(tags="工作组统计") +@RestController +@RequestMapping("/project/payWorkingGroupStatistics") +@Slf4j +public class PayWorkingGroupStatisticsController { + @Autowired + private ISysBaseAPI sysBaseAPI; + @Autowired + private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; + + @Autowired + private IPayWorkingGroupService payWorkingGroupService; + + /** + * 分页列表查询 + * + * @param payWorkingGroupSearch 工作组项目 + * @param pageNo 页数 + * @param pageSize 条数 + * @return + */ + @ApiOperation(value="工作组项目统计-统计分页列表查询", notes="工作组项目统计-统计分页列表查询") + @GetMapping(value = "/list") + public Result list(PayWorkingGroupSearch payWorkingGroupSearch, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch); + double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney()==null ? "0" : t.getAllMoney())).sum(); + double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0" : t.getComeAllMoney())).sum(); + HashMap objectObjectHashMap = new HashMap<>(); + objectObjectHashMap.put("分页集合",pageList); + objectObjectHashMap.put("总计应收总金额",sum); + objectObjectHashMap.put("总计实收总金额",sum2); + return Result.OK(objectObjectHashMap); + } + + /** + * 导出excel + * + */ + @GetMapping(value = "/exportXls2") + @ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel") + public ModelAndView exportXls2() { + List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(); + return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class,"工作组项目统计"); + } + + + /** + * 获取工作组列表 + * + */ + @GetMapping(value = "/getGroupList") + @ApiOperation(value="工作组获取工作组列表下拉框", notes="工作组获取工作组列表下拉框") + public List getGroupList() { + List pageList = payWorkingGroupService.getGroupList(); + return pageList; + } + + /** + * 分页列表查询 + * + * @param payWorkingGroupSubletSearch 工作组成员统计搜索 + * @param pageNo 页数 + * @param pageSize 条数 + * @return + */ + @ApiOperation(value = "工作组成员统计-详情分页列表查询(传工作组id)", notes = "工作组成员统计-详情分页列表查询(传工作组id)") + @GetMapping(value = "/listSub") + public Result list2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch); + double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null ? "0" : t.getAllMoney())).sum(); + double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null ? "0" : t.getComeAllMoney())).sum(); + HashMap objectObjectHashMap = new HashMap<>(); + objectObjectHashMap.put("分页集合", pageList); + objectObjectHashMap.put("总计应收总金额", sum); + objectObjectHashMap.put("总计实收总金额", sum2); + return Result.OK(objectObjectHashMap); + } + /** + *导出 + * @param id + * @return + */ + @GetMapping(value = "/excelSub") + @ApiOperation(value = "工作组成员统计-导出统计(传工作组id)", notes = "工作组成员统计-导出统计(传工作组id)") + public ModelAndView excelSub(@RequestParam(name = "id", required = true) String id) { + List list = payWorkingGroupSubItemService.importExcelStatistics(id); + return AmountUtil.exportListXls(list, PayWorkGroupSubletStatistics.class, "工作组成员统计"); + } + + @ApiOperation(value = "工作组成员字典表获取", notes = "工作组成员字典表获取") + @GetMapping(value = "/getChartUseDict") + public HashMap getChartUse() { + List payment_charge_use = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); + List account_type = sysBaseAPI.queryDictItemsByCode("account_type"); + HashMap> hashMap = new HashMap<>(); + hashMap.put("来款用途", payment_charge_use); + hashMap.put("到账状态", account_type); + return hashMap; + } + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 33afe3fc..71d2494b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -84,29 +84,7 @@ public class PayWorkingGroupSubItemController extends JeroController list2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch); - double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null ? "0" : t.getAllMoney())).sum(); - double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null ? "0" : t.getComeAllMoney())).sum(); - HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("分页集合", pageList); - objectObjectHashMap.put("总计应收总金额", sum); - objectObjectHashMap.put("总计实收总金额", sum2); - return Result.OK(objectObjectHashMap); - } + /** * 添加 @@ -296,16 +274,6 @@ public class PayWorkingGroupSubItemController extends JeroController payment_charge_use = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); - List account_type = sysBaseAPI.queryDictItemsByCode("account_type"); - HashMap> hashMap = new HashMap<>(); - hashMap.put("来款用途", payment_charge_use); - hashMap.put("到账状态", account_type); - return hashMap; - } /** * 通过excel导入数据 @@ -320,16 +288,5 @@ public class PayWorkingGroupSubItemController extends JeroController list = payWorkingGroupSubItemService.importExcelStatistics(id); - return AmountUtil.exportListXls(list, PayWorkGroupSubletStatistics.class, "工作组成员统计"); - } + } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 1ab2367d..d6cf7802 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -111,4 +111,16 @@ group by pwgs.id + \ No newline at end of file