LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 企业来款统计-分类统计

Browse Source
This commit is contained in:
lijiarao
2024-07-19 19:13:47 +08:00
parent 93270ea8d3
commit 65fac10f86
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+19 -9
View File
@@ -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, ',');