From ed1d64c49a32bd00de46b1ee0b4ef61e8d7d59a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 27 Dec 2023 17:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E5=85=A8=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1=EF=BC=88=E7=B4=AF=E8=AE=A1=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=20=E9=A6=96=E9=A1=B5-=E5=85=A8=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1=EF=BC=88=E5=8D=95=E6=9C=88=EF=BC=89?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/index/service/IndexService.java | 9 +++++---- .../com/jero/index/vo/LineChartListVO.java | 2 ++ .../project/mapper/PayWorkingGroupMapper.java | 2 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 13 ++++++++++++ .../impl/PayWorkingGroupServiceImpl.java | 20 +++++++++++++++---- .../entity/AllProjectStatistics.java | 4 ++++ 6 files changed, 42 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 e386af18..d022d8de 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 @@ -1,10 +1,9 @@ package com.jero.index.service; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.DictModel; import com.jero.index.dto.YearMoneyDTO; @@ -19,7 +18,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -78,6 +76,8 @@ public class IndexService { lineChartListVO.setBillMoney(reduce2.toString()); BigDecimal reduce3 = lineChartListVOList.stream().map(i -> new BigDecimal(i.getComeAllMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); lineChartListVO.setComeAllMoney(reduce3.toString()); + BigDecimal reduce4 = lineChartListVOList.stream().map(i -> new BigDecimal(i.getEstimatedArrivalMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + lineChartListVO.setEstimatedArrivalMoney(reduce4.toString()); lineChartListVO.setPaymentDate("总数"); lineChartListVOList.add(lineChartListVO); return lineChartListVOList; @@ -99,6 +99,7 @@ public class IndexService { lineChartListVO.setBillMoney(allProjectStatistics.getBillMoney()); lineChartListVO.setComeAllMoney(allProjectStatistics.getComeAllMoney()); lineChartListVO.setPaymentDate(allProjectStatistics.getPaymentDate()); + lineChartListVO.setEstimatedArrivalMoney(allProjectStatistics.getEstimatedArrivalMoney()); return lineChartListVO; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/LineChartListVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/LineChartListVO.java index c70877e6..07146d55 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/LineChartListVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/LineChartListVO.java @@ -24,4 +24,6 @@ public class LineChartListVO { @ApiModelProperty(value = "到账时间") private String paymentDate; + @ApiModelProperty(value = "预计到账金额") + private String estimatedArrivalMoney; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 828aab27..de3f4c2c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -242,6 +242,8 @@ public interface PayWorkingGroupMapper extends BaseMapper { List cumulativeListComeAllMoney(@Param("paymentYear") String paymentYear); + List cumulativeListEstimatedArrivalMoney(@Param("paymentYear") String paymentYear); + BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); IPage invoiceAmountList(Page page, @Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode, @Param("column") String column, @Param("order") String order); 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 70030485..e0fcb058 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 @@ -2522,4 +2522,17 @@ ) a + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index c056dea1..1df3d058 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -606,7 +606,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl listConfirmAmount = payWorkingGroupMapper.queryListConfirmAmount(allProjectStatisticsSearch); List listBillMoney = payWorkingGroupMapper.queryListBillMoney(allProjectStatisticsSearch); List listComeAllMoney = payWorkingGroupMapper.queryListComeAllMoney(allProjectStatisticsSearch); - return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney); + // 预计到账金额 + List listEstimatedArrivalMoney = payWorkingGroupMapper.cumulativeListEstimatedArrivalMoney(allProjectStatisticsSearch.getPaymentYear()); + return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney,listEstimatedArrivalMoney); } @Override @@ -615,7 +617,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl listConfirmAmount = payWorkingGroupMapper.cumulativeListConfirmAmount(allProjectStatisticsSearch.getPaymentYear()); List listBillMoney = payWorkingGroupMapper.cumulativeListBillMoney(allProjectStatisticsSearch.getPaymentYear()); List listComeAllMoney = payWorkingGroupMapper.cumulativeListComeAllMoney(allProjectStatisticsSearch.getPaymentYear()); - return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney); + // 预计到账金额 + List listEstimatedArrivalMoney = payWorkingGroupMapper.cumulativeListEstimatedArrivalMoney(allProjectStatisticsSearch.getPaymentYear()); + return getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney,listEstimatedArrivalMoney); } @Override @@ -625,7 +629,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl listBillMoney = payWorkingGroupMapper.queryListBillMoney(allProjectStatisticsSearch); List listComeAllMoney = payWorkingGroupMapper.queryListComeAllMoney(allProjectStatisticsSearch); - List list2=getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney); + // 预计到账金额 + List listEstimatedArrivalMoney = payWorkingGroupMapper.cumulativeListEstimatedArrivalMoney(allProjectStatisticsSearch.getPaymentYear()); + List list2=getAllProjectMoneyStatistics(allProjectStatisticsSearch,allMoneyList,listConfirmAmount, listBillMoney,listComeAllMoney,listEstimatedArrivalMoney); AllMoney allMoney=payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList); List comeAllMoneyList=list2.stream().map(AllProjectStatistics::getComeAllMoney).collect(Collectors.toList()); @@ -677,11 +683,13 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl allMoneyList, List listConfirmAmount, List listBillMoney, - List listComeAllMoney) { + List listComeAllMoney, + List listEstimatedArrivalMoney) { Map allMoneyMap = allMoneyList.stream().collect(Collectors.toMap(AllProjectStatistics::getPaymentDate, AllProjectStatistics::getAllMoney)); Map confirmAmountMap = listConfirmAmount.stream().collect(Collectors.toMap(AllProjectStatistics::getPaymentDate, AllProjectStatistics::getConfirmAmount)); Map billMoneyMap = listBillMoney.stream().collect(Collectors.toMap(AllProjectStatistics::getPaymentDate, AllProjectStatistics::getBillMoney)); Map comeAllMoneyMap = listComeAllMoney.stream().collect(Collectors.toMap(AllProjectStatistics::getPaymentDate, AllProjectStatistics::getComeAllMoney)); + Map estimatedArrivalMoneyMap = listEstimatedArrivalMoney.stream().collect(Collectors.toMap(AllProjectStatistics::getPaymentDate, AllProjectStatistics::getComeAllMoney)); String paymentYear=allProjectStatisticsSearch.getPaymentYear(); List yearMonth = getYearMonth(paymentYear); @@ -692,6 +700,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl