From d19282e030ee7cc70cdfc76caf718d7361a1e77b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 30 Jul 2024 14:19:06 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087761=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1-=E4=B8=AA?= =?UTF-8?q?=E5=88=AB=E4=BC=81=E4=B8=9A=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=2087754=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=8E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=BB=BA=E8=AE=AE=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PayCompanyManagementMapper.java | 2 ++ .../mapper/xml/PayCompanyManagementMapper.xml | 5 ++-- .../service/IPayCompanyManagementService.java | 2 ++ .../impl/PayCompanyManagementServiceImpl.java | 5 ++++ .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../CompanyComeMoneyStatisticsController.java | 30 +++++++++---------- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java index 064af4f4..f430a244 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java @@ -35,4 +35,6 @@ public interface PayCompanyManagementMapper extends BaseMapper pageSafetyCenter(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); Page pageHaveMoney(Page page, @Param("chargeCompanyIds") List chargeCompanyIds); + + List pageHaveMoney(@Param("chargeCompanyIds") List chargeCompanyIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index d62ee0de..80856064 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml @@ -48,11 +48,12 @@ \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index 057da062..eb6c1425 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -128,4 +128,6 @@ public interface IPayCompanyManagementService extends IService pageSafetyCenter(Page page, QueryWrapper queryWrapper); Page pageHaveMoney(Page page, List chargeCompanyIds); + + List pageHaveMoney(List chargeCompanyIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 004fb430..4576dcc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -703,6 +703,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl pageHaveMoney(List chargeCompanyIds) { + return payCompanyManagementMapper.pageHaveMoney(chargeCompanyIds); + } + /** * 校验企业名称和信用代码是否匹配 * @param payCompanyManagement 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 9a64c914..832fa9c9 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 @@ -2691,7 +2691,7 @@ from v_statistical v - + #{item} 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 7fe33b42..99ef860b 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 @@ -252,7 +252,8 @@ public class CompanyComeMoneyStatisticsController { //获取分页后需要统计的企业 Page page = new Page<>(pageNo, pageSize); Page companyManagementPage = payCompanyManagementService.pageHaveMoney(page,chargeCompanyIds); - chargeCompanyIds = companyManagementPage.getRecords().stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); + List companyManagementList = companyManagementPage.getRecords(); + chargeCompanyIds = companyManagementList.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); String year_begin = companyComeMoneySearch.getYear_begin(); @@ -302,16 +303,15 @@ public class CompanyComeMoneyStatisticsController { List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); - for (String companyId : chargeCompanyIds) { + for (PayCompanyManagement companyManagement : companyManagementList) { + String companyId = companyManagement.getId(); Map lm = new HashMap<>(); + + String companyName = companyManagement.getCompanyName(); + lm.put("name", companyName); + //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (CollectionUtil.isEmpty(companyDateList)) { - continue; - }else { - String companyName = companyDateList.get(0).getCompanyName(); - lm.put("name", companyName); - } //按年份分组 Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); for (String yearKey : years) { @@ -406,7 +406,7 @@ public class CompanyComeMoneyStatisticsController { chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); allSearch.setChargeCompanyIds(chargeCompanyIds); } - + List companyManagementList = payCompanyManagementService.pageHaveMoney(chargeCompanyIds); String year_begin = companyComeMoneySearch.getYear_begin(); String year_end = companyComeMoneySearch.getYear_end(); int integer1 = Integer.parseInt(year_begin); @@ -446,16 +446,14 @@ public class CompanyComeMoneyStatisticsController { List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); - for (String companyId : chargeCompanyIds) { + for (PayCompanyManagement companyManagement : companyManagementList) { + String companyId = companyManagement.getId(); Map lm = new HashMap<>(); + + String companyName = companyManagement.getCompanyName(); + lm.put("name", companyName); //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (CollectionUtil.isEmpty(companyDateList)) { - continue; - }else { - String companyName = companyDateList.get(0).getCompanyName(); - lm.put("name", companyName); - } //按年份分组 Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); for (String yearKey : years) {