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 4f8b2a75..e4ee8392 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 @@ -304,9 +304,11 @@ public class CompanyComeMoneyStatisticsController { //获得单一年数据 List dataList = yearKeyMap.get(yearKey); BigDecimal bigDecimal = new BigDecimal("0.00"); - for (CompanyComeMoneyClassificationList list1 : dataList) { - String allMoney = list1.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } lm.put(yearKey, bigDecimal.toString()); String allStr = allMap.get(yearKey); @@ -319,10 +321,12 @@ public class CompanyComeMoneyStatisticsController { for (DictModel dictModel : dictModels) { BigDecimal bigDecimal = new BigDecimal("0.00"); String value = dictModel.getValue(); - for (CompanyComeMoneyClassificationList list2 : dataList) { - if (list2.getChargeUse().equals(value)) { - String allMoney = list2.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } } String key = yearKey + "_" + value; @@ -413,9 +417,11 @@ public class CompanyComeMoneyStatisticsController { //获得单一年数据 List dataList = yearKeyMap.get(yearKey); BigDecimal bigDecimal = new BigDecimal("0.00"); - for (CompanyComeMoneyClassificationList list1 : dataList) { - String allMoney = list1.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } lm.put("je_"+yearKey, bigDecimal.toString()); } @@ -425,10 +431,12 @@ public class CompanyComeMoneyStatisticsController { for (DictModel dictModel : dictModels) { BigDecimal bigDecimal = new BigDecimal("0.00"); String value = dictModel.getValue(); - for (CompanyComeMoneyClassificationList list2 : dataList) { - if (list2.getChargeUse().equals(value)) { - String allMoney = list2.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } } lm.put("je_"+yearKey+"_"+value, bigDecimal.toString());