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:01:12 +08:00
parent 4844e7135e
commit 93270ea8d3
1 changed files with 21 additions and 5 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
+21 -5
View File
@@ -246,11 +246,18 @@ 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) {
Map<String, String> lm = new HashMap<>();
lm.put("name", s + "年度待确收金额");
lm.put("je", "t.je_"+s);
lm.put("key", s);
allMap.put(s,zero.toString());
titleList.add(lm);
}
for (String s : years) {
@@ -259,7 +266,8 @@ public class CompanyComeMoneyStatisticsController {
String text = dictModel.getText();
String value = dictModel.getValue();
lm.put("name", s + "年度-" + text +"-待确收金额");
lm.put("je", "t.je_"+s+"_"+value);
lm.put("key", s+"_"+value);
allMap.put(s+"_"+value,zero.toString());
titleList.add(lm);
}
}
@@ -289,7 +297,10 @@ public class CompanyComeMoneyStatisticsController {
String allMoney = list1.getAllMoney();
bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
}
lm.put("je_"+yearKey, bigDecimal.toString());
lm.put(yearKey, bigDecimal.toString());
String allStr = allMap.get(yearKey);
BigDecimal all = new BigDecimal(allStr).add(bigDecimal);
allMap.put(yearKey,all.toString());
}
for (String yearKey : years) {
//获得单一年数据
@@ -303,12 +314,17 @@ public class CompanyComeMoneyStatisticsController {
bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
}
}
lm.put("je_"+yearKey+"_"+value, bigDecimal.toString());
String key = yearKey + "_" + value;
lm.put(key, bigDecimal.toString());
String allStr = allMap.get(key);
BigDecimal all = new BigDecimal(allStr).add(bigDecimal);
allMap.put(key,all.toString());
}
}
valList.add(lm);
}
map.put("valList", valList);
map.put("allMap", allMap);
return Result.OK(map);
}/**