diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java index 5843ea6b..e5534b03 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java @@ -453,8 +453,9 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { } // 如果费用是空的、null、0 那么就根据数量和单价计算 if (bean.getCosts() == null || bean.getCosts().compareTo(BigDecimal.ZERO) < 0 || bean.getCosts().equals(BigDecimal.ZERO)) { - BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(GlobalConstants.INT_2, RoundingMode.DOWN); + BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(GlobalConstants.INT_2, RoundingMode.HALF_UP); bean.setCosts(costs); + log.info("租赁费用:"+costs); } } return leaseList; @@ -1372,6 +1373,12 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { } List rawResults; +// PeriodCostResultVo sltStatus = sltAgreementInfoMapper.selectSltStatus(queryDto); +// +// if(sltStatus != null){ +// queryDto.setSettlementStatus(sltStatus.getSettlementStatus()); +// } + if (StringUtils.isNotBlank(queryDto.getSettlementStatus()) && queryDto.getSettlementStatus().equals("2")) { // 从数据库slt_agreement_details表查询【已结算明细】 rawResults = sltAgreementInfoMapper.selectLeasePeriodCostListBySltDetails(queryDto);