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 098cbd2a..680c139b 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 @@ -246,11 +246,18 @@ public class CompanyComeMoneyStatisticsController { //获取表头 List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); List> titleList = new ArrayList<>(); + Map map1 = new HashMap<>(); + map1.put("name", "企业名称"); + map1.put("key", "name"); + titleList.add(map1); + + Map allMap = new HashMap<>(); + BigDecimal zero = new BigDecimal("0.00"); for (String s : years) { Map 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); }/**