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 aa113483..1f48e38a 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 @@ -190,6 +190,13 @@ public class IndexService { } } } + BigDecimal allConfirmAmount = all.stream().map(i -> new BigDecimal(i.getConfirmAmount())).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal allAllMoney = all.stream().map(i -> new BigDecimal(i.getAllMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + DepartStatistics departStatistics = new DepartStatistics(); + departStatistics.setDepartName("总数"); + departStatistics.setConfirmAmount(allConfirmAmount.toString()); + departStatistics.setAllMoney(allAllMoney.toString()); + all.add(departStatistics); return convertDepartStatistics(all); } @@ -216,14 +223,6 @@ public class IndexService { histogramVO.setValue(divide.toString()); histogramVOlist.add(histogramVO); } - BigDecimal allConfirmAmount = list.stream().map(i -> new BigDecimal(i.getConfirmAmount())).reduce(BigDecimal.ZERO, BigDecimal::add); - BigDecimal allAllMoney = list.stream().map(i -> new BigDecimal(i.getAllMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); - HistogramVO histogramVO = new HistogramVO(); - histogramVO.setName("总数"); - histogramVO.setConfirmAmount(allConfirmAmount.toString()); - histogramVO.setAllMoney(allAllMoney.toString()); - histogramVO.setValue("100"); - histogramVOlist.add(histogramVO); return histogramVOlist; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 6018285f..54ad061f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2756,5 +2756,6 @@ year = #{year} group by departCode + order by allMoney desc