bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算修改

This commit is contained in:
bonus 2025-12-17 11:25:15 +08:00
parent a065b8ecde
commit 3cef269a7a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -751,7 +751,7 @@ public class SltAgreementInfoController extends BaseController {
if (null == bean.getLeasePrice()) { if (null == bean.getLeasePrice()) {
bean.setLeasePrice(BigDecimal.valueOf(0.00)); bean.setLeasePrice(BigDecimal.valueOf(0.00));
}else{ }else{
bean.setLeasePrice(bean.getLeasePrice().setScale(2, RoundingMode.HALF_UP)); bean.setLeasePrice(bean.getLeasePrice().setScale(3, RoundingMode.DOWN));
} }
if (null == bean.getNum()) { if (null == bean.getNum()) {
@ -1290,7 +1290,8 @@ public class SltAgreementInfoController extends BaseController {
BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal leasePrice = bean.getLeasePrice();
BigDecimal num = bean.getNum(); BigDecimal num = bean.getNum();
BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays());
BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); // BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays);
BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(GlobalConstants.INT_2, RoundingMode.HALF_UP);
if(costs!=null){ if(costs!=null){
totalCostLease = totalCostLease.add(costs); totalCostLease = totalCostLease.add(costs);
} }
@ -1450,7 +1451,8 @@ public class SltAgreementInfoController extends BaseController {
BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal leasePrice = bean.getLeasePrice();
BigDecimal num = bean.getNum(); BigDecimal num = bean.getNum();
BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays());
BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays).setScale(GlobalConstants.INT_2, RoundingMode.HALF_UP);
totalCostLease = totalCostLease.add(costs); totalCostLease = totalCostLease.add(costs);
bean.setCosts(costs); bean.setCosts(costs);
} }

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -489,7 +489,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
if (leaseDays.compareTo(BigDecimal.ZERO) < 0) { if (leaseDays.compareTo(BigDecimal.ZERO) < 0) {
leaseDays = BigDecimal.ZERO; leaseDays = 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); bean.setCosts(costs);
} }
return leaseList; return leaseList;
@ -834,7 +834,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
id = sltInfoVo.getId(); id = sltInfoVo.getId();
sltInfoVo.setUpdateTime(DateUtils.getNowDate()); sltInfoVo.setUpdateTime(DateUtils.getNowDate());
} }
if (!sltInfoVo.getLeaseList().isEmpty()) { if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredLeaseList = getLeaseList(info).stream() List<SltAgreementInfo> filteredLeaseList = getLeaseList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -842,7 +842,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
sltAgreementInfoMapper.insertSltAgreementDetailLease(filteredLeaseList, id); sltAgreementInfoMapper.insertSltAgreementDetailLease(filteredLeaseList, id);
} }
} }
if (!sltInfoVo.getRepairList().isEmpty()) { if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredRepairList = getRepairList(info).stream() List<SltAgreementInfo> filteredRepairList = getRepairList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -850,7 +850,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
sltAgreementInfoMapper.insertSltAgreementDetailRepair(filteredRepairList, id); sltAgreementInfoMapper.insertSltAgreementDetailRepair(filteredRepairList, id);
} }
} }
if (!sltInfoVo.getScrapList().isEmpty()) { if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredScrapList = getScrapList(info).stream() List<SltAgreementInfo> filteredScrapList = getScrapList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -858,7 +858,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
sltAgreementInfoMapper.insertSltAgreementDetailScrap(filteredScrapList, id); sltAgreementInfoMapper.insertSltAgreementDetailScrap(filteredScrapList, id);
} }
} }
if (!sltInfoVo.getLoseList().isEmpty()) { if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredLoseList = getLoseList(info).stream() List<SltAgreementInfo> filteredLoseList = getLoseList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId())) .filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList()); .collect(Collectors.toList());