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 15f2390b..80ec6de9 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 @@ -278,4 +278,5 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListForCompanyClassification(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch); + List queryPageListExcelForProject(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @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 832fa9c9..649182ca 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 @@ -2706,4 +2706,140 @@ group by chargeCompanyId,year,chargeUse + + 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 85a1d341..872ff7bc 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 @@ -269,4 +269,6 @@ public interface IPayWorkingGroupService extends IService { void exportAllFile(HttpServletRequest request, HttpServletResponse response, PayWorkingGroup payWorkingGroup); List queryPageListForCompanyClassification(CompanyComeMoneySearch companyComeMoneySearch); + + List queryPageListExcelForProject(AllProjectStatisticsSearch allProjectStatisticsSearch, 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 0322ab55..302f7fbf 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 @@ -609,6 +609,13 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl idList) { return payWorkingGroupMapper.queryPageListProjectTotal(allProjectStatisticsSearch, idList); } + /** + * 科室统计excel + */ + @Override + public List queryPageListExcelForProject(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageListExcelForProject(allProjectStatisticsSearch, idList); + } @Override public AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch,List 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 1259acd4..f92744f6 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 @@ -239,7 +239,7 @@ public class AllProjectStatisticsController { return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "科室统计"); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); + List pageList = payWorkingGroupService.queryPageListExcelForProject(allProjectStatisticsSearch, idList); if (pageList != null) { for (AllProjectStatistics s : pageList) { String key = String.valueOf(s.getChargeUse());