bug
This commit is contained in:
parent
368d29794f
commit
47bc628239
@ -275,7 +275,7 @@ public class HomeServiceImpl implements HomeService {
|
||||
List<Long> companyIds = expireContact.stream().map(PsContractBusiness::getCompanyId).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>()
|
||||
.ge(startDate != null,"apply_date", startDate)
|
||||
@ -288,7 +288,7 @@ public class HomeServiceImpl implements HomeService {
|
||||
//已续费的合同
|
||||
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.setContractNum(expireContact.size());
|
||||
|
Loading…
Reference in New Issue
Block a user