mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-11-22 09:40:30 +08:00
parent 368d29794f
commit 47bc628239
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
View File

@ -275,7 +275,7 @@ public class HomeServiceImpl implements HomeService {
List<Long> companyIds = expireContact.stream().map(PsContractBusiness::getCompanyId).toList(); List<Long> companyIds = expireContact.stream().map(PsContractBusiness::getCompanyId).toList();
List<String> contractCodeList = expireContact.stream().map(PsContractBusiness::getContractCode).toList(); List<String> 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<PsContractInfo> contractWrapper = new QueryWrapper<PsContractInfo>() QueryWrapper<PsContractInfo> contractWrapper = new QueryWrapper<PsContractInfo>()
.ge(startDate != null,"apply_date", startDate) .ge(startDate != null,"apply_date", startDate)
@ -288,7 +288,7 @@ public class HomeServiceImpl implements HomeService {
//已续费的合同 //已续费的合同
List<PsContractBusinessVo> renewalContact = psHomeMapper.selectRenewalContract(contractWrapper); List<PsContractBusinessVo> 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 renewalInfoVo = new RenewalInfoVo();
renewalInfoVo.setContractNum(expireContact.size()); renewalInfoVo.setContractNum(expireContact.size());