diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java index 116d97c3..64a12607 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java @@ -68,6 +68,18 @@ public class IndexService { allProjectStatisticsSearch.setPaymentYear(year); List list = payWorkingGroupService.queryListAllProjectMoney(allProjectStatisticsSearch, null); List lineChartListVOList = convertLineChartListVO(list); + //总数 + LineChartListVO lineChartListVO = new LineChartListVO(); + BigDecimal reduce = lineChartListVOList.stream().map(i -> new BigDecimal(i.getAllMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + lineChartListVO.setAllMoney(reduce.toString()); + BigDecimal reduce1 = lineChartListVOList.stream().map(i -> new BigDecimal(i.getConfirmAmount())).reduce(BigDecimal.ZERO, BigDecimal::add); + lineChartListVO.setConfirmAmount(reduce1.toString()); + BigDecimal reduce2 = lineChartListVOList.stream().map(i -> new BigDecimal(i.getBillMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + lineChartListVO.setBillMoney(reduce2.toString()); + BigDecimal reduce3 = lineChartListVOList.stream().map(i -> new BigDecimal(i.getComeAllMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + lineChartListVO.setComeAllMoney(reduce3.toString()); + lineChartListVO.setPaymentDate("总数"); + lineChartListVOList.add(lineChartListVO); return lineChartListVOList; }