From 82f9c0b587359807d48bc04a037cac0e88734539 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Thu, 23 Sep 2021 17:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 8 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 15 ---- .../service/IPayWorkingGroupService.java | 8 +- .../impl/PayWorkingGroupServiceImpl.java | 6 +- .../CompanyComeMoneyStatisticsController.java | 82 +++++++++---------- 5 files changed, 61 insertions(+), 58 deletions(-) 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 13144398..29e42002 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 @@ -134,4 +134,12 @@ public interface PayWorkingGroupMapper extends BaseMapper { * @return */ IPage queryPageListForCompanyDetail(Page page,@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); + + /** + * 企业来款详情 + * @param + * @param companyComeMoneyDetailSearch + * @return + */ + List queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); } 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 fb05bca8..76e5b84c 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 @@ -187,9 +187,6 @@ AND pwgs.charge_company_temporary_name LIKE concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) - - AND pwgs.in_account=#{allProjectStatisticsSearch.inAccountStatue} - AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId} @@ -239,9 +236,6 @@ AND pcp.charge_use=#{allProjectStatisticsSearch.chargeUse} - - AND pcp.in_account=#{allProjectStatisticsSearch.inAccountStatue} - AND pcp.principal_id=#{allProjectStatisticsSearch.principalNameId} @@ -296,9 +290,6 @@ AND pmps.company_name LIKE concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) - - AND pmps.in_account=#{allProjectStatisticsSearch.inAccountStatue} - AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId} @@ -352,9 +343,6 @@ AND pms.company_name LIKE concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) - - AND pms.in_account=#{allProjectStatisticsSearch.inAccountStatue} - AND pm.director_id=#{allProjectStatisticsSearch.principalNameId} @@ -408,9 +396,6 @@ AND tmps.company_name LIKE concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) - - AND tmps.in_account=#{allProjectStatisticsSearch.inAccountStatue} - AND tmps.pack=#{allProjectStatisticsSearch.pack} 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 a8c063b9..434171ad 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 @@ -2,7 +2,6 @@ package com.jero.project.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSearch; import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.vo.PayWorkingGroupVO; @@ -159,4 +158,11 @@ public interface IPayWorkingGroupService extends IService { * @return */ IPage queryPageListForCompanyDetail(Page page, CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); + + /** + * 企业来款详情统计 + * @param companyComeMoneyDetailSearch + * @return + */ + List queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); } 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 888920fa..e8294aae 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 @@ -11,7 +11,6 @@ import com.jero.contract.service.IPayIncomeContractService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.project.entity.*; -import com.jero.project.service.IPayWorkingGroupDataFileService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.PayWorkingGroupVO; import com.jero.project.service.IPayWorkingGroupService; @@ -257,6 +256,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) { + return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch); + } + /** * @Description 校验是存在关联合同的项目 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index abaf52a1..58b3e110 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -135,56 +135,56 @@ public class CompanyComeMoneyStatisticsController { } - /** - *个人来款统计导出 - * - */ - @GetMapping(value = "/excel") - @ApiOperation(value = "个人来款统计导出-导出统计", notes = "个人来款统计导出-导出统计") - public ModelAndView excel(PrincipalPeopleSearch principalPeopleSearch) { - if (principalPeopleSearch.getYear() == null || principalPeopleSearch.getYear().equals("")) { - Calendar calendar = Calendar.getInstance(); - String year = String.valueOf(calendar.get(Calendar.YEAR)); - principalPeopleSearch.setYear(year); - } - //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - //科长 - if(constant.BMFZR.equals(roleCode)) { - String orgCode = sysUser.getOrgCode(); - List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); - idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) { - idList=null; - //企业职员项目负责人 - }else if( constant.QYRY.equals(roleCode)){ - String userId = sysUser.getId(); - idList.add(userId); - } - List pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList); - - return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "个人来款"); - } +// /** +// *企业来款统计 +// * +// */ +// @GetMapping(value = "/excel") +// @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") +// public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) { +// if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) { +// Calendar calendar = Calendar.getInstance(); +// String year = String.valueOf(calendar.get(Calendar.YEAR)); +// companyComeMoneySearch.setYear(year); +// } +// //根据不同角色加载不同列表的参数 +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// //科长 +// if(constant.BMFZR.equals(roleCode)) { +// String orgCode = sysUser.getOrgCode(); +// List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); +// idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); +// //所领导或者超级管理员 +// } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) { +// idList=null; +// //企业职员项目负责人 +// }else if( constant.QYRY.equals(roleCode)){ +// String userId = sysUser.getId(); +// idList.add(userId); +// } +// List pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList); +// +// return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "企业来款统计"); +// } /** - *个人来款统详情计导出 + *企业来款统计 * */ @GetMapping(value = "/excelDetail") - @ApiOperation(value = "个人来款统详情计导出-导出统计", notes = "个人来款统详情计导出-导出统计") - public ModelAndView excelDetail( PrincipalPeopleDetailSearch principalPeopleDetailSearch) { - if (principalPeopleDetailSearch.getYear() == null || principalPeopleDetailSearch.getYear().equals("")) { + @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计") + public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) { + if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); - principalPeopleDetailSearch.setYear(year); + companyComeMoneyDetailSearch.setYear(year); } - List pageList = payWorkingGroupService.queryPageListForPrincipalDetailExcel(principalPeopleDetailSearch); + List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch); - return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "个人来款详情"); + return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "企业来款详情统计"); } }