From 64e727012d5e376d4e0c4b87555c10e5848192b3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 31 Oct 2022 14:32:38 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E7=A7=91=E5=AE=A4=E6=80=BB=E4=BD=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=80=BB=E6=95=B0=E4=BF=AE=E6=94=B9=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/index/service/IndexService.java | 15 +++++++-------- .../project/mapper/xml/PayWorkingGroupMapper.xml | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) 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