From 65fac10f865048369c8558ef8bf2a4bb2e1246b3 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 19 Jul 2024 19:13:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyComeMoneyStatisticsController.java | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

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 680c139b..f8b429cc 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
@@ -42,6 +42,7 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.hutool.poi.excel.sax.AttributeName.s;
 
@@ -236,8 +237,15 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> classification(CompanyComeMoneySearch companyComeMoneySearch,
                                     HttpServletResponse response) {
         String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId();
-        List<String> chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
-        companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        List<String> chargeCompanyIds;
+        if (StringUtils.isNotBlank(chargeCompanyId)){
+            chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
+            companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        }else {
+            List<PayCompanyManagement> list = payCompanyManagementService.list();
+            chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList());
+            companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        }
 
         String year = companyComeMoneySearch.getYear();
         List<String> years = StrUtil.split(year, ',');
@@ -246,11 +254,6 @@ public class CompanyComeMoneyStatisticsController {
         //获取表头
         List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use");
         List<Map<String, String>> titleList = new ArrayList<>();
-        Map<String, String> map1 = new HashMap<>();
-        map1.put("name", "企业名称");
-        map1.put("key", "name");
-        titleList.add(map1);
-
         Map<String, String> allMap = new HashMap<>();
         BigDecimal zero = new BigDecimal("0.00");
         for (String s : years) {
@@ -338,8 +341,15 @@ public class CompanyComeMoneyStatisticsController {
     public void classificationExcel(CompanyComeMoneySearch companyComeMoneySearch,
                                     HttpServletResponse response) {
         String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId();
-        List<String> chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
-        companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        List<String> chargeCompanyIds;
+        if (StringUtils.isNotBlank(chargeCompanyId)){
+            chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
+            companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        }else {
+            List<PayCompanyManagement> list = payCompanyManagementService.list();
+            chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList());
+            companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        }
 
         String year = companyComeMoneySearch.getYear();
         List<String> years = StrUtil.split(year, ',');