From 47bc628239830a91adea20d50293cbb649a6a4ca Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Fri, 22 Nov 2024 09:40:30 +0800 Subject: [PATCH] bug --- .../com/pusong/business/service/impl/HomeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index 9d3ec8b..fcbe87d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -275,7 +275,7 @@ public class HomeServiceImpl implements HomeService { List companyIds = expireContact.stream().map(PsContractBusiness::getCompanyId).toList(); List contractCodeList = expireContact.stream().map(PsContractBusiness::getContractCode).toList(); //总到期金额 - BigDecimal sumExpireAmount = expireContact.stream().map(PsContractBusiness::getBusinessAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + BigDecimal sumExpireAmount = expireContact.stream().map(PsContractBusiness::getBusinessAmount).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); QueryWrapper contractWrapper = new QueryWrapper() .ge(startDate != null,"apply_date", startDate) @@ -288,7 +288,7 @@ public class HomeServiceImpl implements HomeService { //已续费的合同 List renewalContact = psHomeMapper.selectRenewalContract(contractWrapper); //总已续费金额 - BigDecimal sumRenewalAmount = renewalContact.stream().map(PsContractBusinessVo::getBusinessAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); + BigDecimal sumRenewalAmount = renewalContact.stream().map(PsContractBusinessVo::getBusinessAmount).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); RenewalInfoVo renewalInfoVo = new RenewalInfoVo(); renewalInfoVo.setContractNum(expireContact.size());