diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index b3d0aceb..512b5403 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -214,5 +214,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { IPage queryPageListDepartment(Page page, @Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); + List queryPageListDepartment(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); + AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 3e7b1761..5639c628 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1100,10 +1100,10 @@ order by billMoney desc - + order by confirmAmount desc - + order by confirmAmount diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 72d3f447..6c735273 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -235,5 +235,7 @@ public interface IPayWorkingGroupService extends IService { IPage queryPageListDepartment(Page page, DepartStatisticsSearch allProjectStatisticsSearch, List idList); + List queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List idList); + AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 310f0417..c2efb540 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -600,6 +600,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageListDepartment(departStatisticsSearch, idList); + } + @Override public AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList) { return payWorkingGroupMapper.queryPageListDepartment33(departStatisticsSearch, idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 80fb0d43..31fa6a90 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -304,7 +304,7 @@ public class AllProjectStatisticsController { * @param pageNo 页数 * @param pageSize 条数 */ - //@RequiresPermissions("projectPaymentStatistics:search") + @RequiresPermissions("departmentAllStatistics:search") @ApiOperation(value = "科室统计-分页列表查询", notes = "科室统计-详情分页列表查询") @GetMapping(value = "/listDepartment") public Result listDepartment(DepartStatisticsSearch departStatisticsSearch, @@ -352,4 +352,44 @@ public class AllProjectStatisticsController { } + /** + * 企业来款统计 + */ + @RequiresPermissions("departmentAllStatistics:export") + @AutoLog(value = "科室统计-导出统计") + @GetMapping(value = "/department/excelProject") + @ApiOperation(value = "项目来款统计-导出统计", notes = "项目来款统计-导出统计") + public ModelAndView excelProject(DepartStatisticsSearch departStatisticsSearch) { + //根据不同角色加载不同列表的参数 + List idList = new ArrayList<>(); + //判断登录角色,显示特定内容,判断依据为登录用户的角色和机构编码 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String roleCode = sysUser.getRoleCode(); + List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); + + //admin + if (roleCodes.contains(constant.ADMIN)) { + + } else if (roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD)) { + //获取本部门下全部子部门的id(包含本部门) + List allDepartIds = sysBaseAPI.getAllDepartIdsByDepart(sysUser.getDepartIds(), idList); + + idList.addAll(allDepartIds); + } else { + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, DepartStatistics.class, "科室总体统计"); + } + List list = payWorkingGroupService.queryPageListDepartmentExcel(departStatisticsSearch, idList); + //处理为空数据为0 + for (DepartStatistics s : list) { + if (s.getAllMoney() == null || s.getAllMoney().equals("")) { + s.setAllMoney("0.00"); + } + if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) { + s.setComeAllMoney("0.00"); + } + } + return AmountUtil.exportListXls(list, DepartStatistics.class, "科室总体统计"); + } + }