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:40:38 +08:00
parent 1e3ca8738a
commit 26908c2cee
1 changed files with 22 additions and 14 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
+8
View File
@@ -304,10 +304,12 @@ public class CompanyComeMoneyStatisticsController {
//获得单一年数据 //获得单一年数据
List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey); List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey);
BigDecimal bigDecimal = new BigDecimal("0.00"); BigDecimal bigDecimal = new BigDecimal("0.00");
if (dataList != null){
for (CompanyComeMoneyClassificationList list1 : dataList) { for (CompanyComeMoneyClassificationList list1 : dataList) {
String allMoney = list1.getAllMoney(); String allMoney = list1.getAllMoney();
bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
} }
}
lm.put(yearKey, bigDecimal.toString()); lm.put(yearKey, bigDecimal.toString());
String allStr = allMap.get(yearKey); String allStr = allMap.get(yearKey);
BigDecimal all = new BigDecimal(allStr).add(bigDecimal); BigDecimal all = new BigDecimal(allStr).add(bigDecimal);
@@ -319,12 +321,14 @@ public class CompanyComeMoneyStatisticsController {
for (DictModel dictModel : dictModels) { for (DictModel dictModel : dictModels) {
BigDecimal bigDecimal = new BigDecimal("0.00"); BigDecimal bigDecimal = new BigDecimal("0.00");
String value = dictModel.getValue(); String value = dictModel.getValue();
if (dataList != null){
for (CompanyComeMoneyClassificationList list2 : dataList) { for (CompanyComeMoneyClassificationList list2 : dataList) {
if (list2.getChargeUse().equals(value)) { if (list2.getChargeUse().equals(value)) {
String allMoney = list2.getAllMoney(); String allMoney = list2.getAllMoney();
bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
} }
} }
}
String key = yearKey + "_" + value; String key = yearKey + "_" + value;
lm.put(key, bigDecimal.toString()); lm.put(key, bigDecimal.toString());
String allStr = allMap.get(key); String allStr = allMap.get(key);
@@ -413,10 +417,12 @@ public class CompanyComeMoneyStatisticsController {
//获得单一年数据 //获得单一年数据
List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey); List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey);
BigDecimal bigDecimal = new BigDecimal("0.00"); BigDecimal bigDecimal = new BigDecimal("0.00");
if (dataList != null){
for (CompanyComeMoneyClassificationList list1 : dataList) { for (CompanyComeMoneyClassificationList list1 : dataList) {
String allMoney = list1.getAllMoney(); String allMoney = list1.getAllMoney();
bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
} }
}
lm.put("je_"+yearKey, bigDecimal.toString()); lm.put("je_"+yearKey, bigDecimal.toString());
} }
for (String yearKey : years) { for (String yearKey : years) {
@@ -425,12 +431,14 @@ public class CompanyComeMoneyStatisticsController {
for (DictModel dictModel : dictModels) { for (DictModel dictModel : dictModels) {
BigDecimal bigDecimal = new BigDecimal("0.00"); BigDecimal bigDecimal = new BigDecimal("0.00");
String value = dictModel.getValue(); String value = dictModel.getValue();
if (dataList != null){
for (CompanyComeMoneyClassificationList list2 : dataList) { for (CompanyComeMoneyClassificationList list2 : dataList) {
if (list2.getChargeUse().equals(value)) { if (list2.getChargeUse().equals(value)) {
String allMoney = list2.getAllMoney(); String allMoney = list2.getAllMoney();
bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
} }
} }
}
lm.put("je_"+yearKey+"_"+value, bigDecimal.toString()); lm.put("je_"+yearKey+"_"+value, bigDecimal.toString());
} }
} }