Commit ec7abdf0 authored by huyuchen's avatar huyuchen

hyc-项目余额调整

parent db7cfa92
...@@ -363,7 +363,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E ...@@ -363,7 +363,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
info = baseMapper.getClaimInfoByDeptNo(deptNo,"3"); info = baseMapper.getClaimInfoByDeptNo(deptNo,"3");
if (Optional.ofNullable(info).isPresent()) { if (Optional.ofNullable(info).isPresent()) {
if (info.getSurMoney().add(money).compareTo(BigDecimal.ZERO) >=0) { if (info.getSurMoney().add(money).compareTo(BigDecimal.ZERO) >=0) {
info.setAdjustMoney(money.negate()); info.setAdjustMoney(money);
info.setAfterAdjustMoney(BigDecimalUtils.safeAdd(info.getSurMoney(),money)); info.setAfterAdjustMoney(BigDecimalUtils.safeAdd(info.getSurMoney(),money));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), info.getErrorInfo(),info)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), info.getErrorInfo(),info));
} else { } else {
...@@ -387,7 +387,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E ...@@ -387,7 +387,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
for (ClaimRebackInfotVO subInfo : infoList) { for (ClaimRebackInfotVO subInfo : infoList) {
//分批去减去金额 //分批去减去金额
if (subInfo.getSurMoney().add(money).compareTo(BigDecimal.ZERO) >=0) { if (subInfo.getSurMoney().add(money).compareTo(BigDecimal.ZERO) >=0) {
subInfo.setAdjustMoney(money.negate()); subInfo.setAdjustMoney(money);
subInfo.setAfterAdjustMoney(BigDecimalUtils.safeAdd(subInfo.getSurMoney(),money)); subInfo.setAfterAdjustMoney(BigDecimalUtils.safeAdd(subInfo.getSurMoney(),money));
money = BigDecimal.ZERO; money = BigDecimal.ZERO;
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), subInfo.getErrorInfo(),subInfo)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), subInfo.getErrorInfo(),subInfo));
......
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
<!--根据项目编码和申请人查询款项认领明细--> <!--根据项目编码和申请人查询款项认领明细-->
<select id="getClaimInfoByDeptNo" resultType="com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO"> <select id="getClaimInfoByDeptNo" resultType="com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO">
select select
fd_3afb4c634ebd08 claimNo,
fd_3afb4689209aa2 deptNo, fd_3afb4689209aa2 deptNo,
fd_3afb468b23b0e2 deptName, fd_3afb468b23b0e2 deptName,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney, fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney, fd_3afb46ac507904 cancelMoney,
ifnull(fd_3afb46d05d19ec,0) surMoney, ifnull(fd_3afb46d05d19ec,0) surMoney,
...@@ -179,9 +179,9 @@ ...@@ -179,9 +179,9 @@
<!--根据项目编码和申请人查询款项认领明细--> <!--根据项目编码和申请人查询款项认领明细-->
<select id="getClaimBigInfoByDeptNoAndUser" resultType="com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO"> <select id="getClaimBigInfoByDeptNoAndUser" resultType="com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO">
select select
fd_3afb4c634ebd08 claimNo,
fd_3afb4689209aa2 deptNo, fd_3afb4689209aa2 deptNo,
fd_3afb468b23b0e2 deptName, fd_3afb468b23b0e2 deptName,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney, fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney, fd_3afb46ac507904 cancelMoney,
ifnull(fd_3afb46d05d19ec,0) surMoney, ifnull(fd_3afb46d05d19ec,0) surMoney,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment