Commit b8529c26 authored by huyuchen's avatar huyuchen

hyc-余额校验提示语优化

parent fe09151c
...@@ -375,7 +375,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E ...@@ -375,7 +375,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
info.setAfterAdjustMoney(BigDecimal.ZERO); info.setAfterAdjustMoney(BigDecimal.ZERO);
money = info.getSurMoney().add(money); money = info.getSurMoney().add(money);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), info.getErrorInfo(),info)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), info.getErrorInfo(),info));
this.subSwitch(deptNo,backInfo,errorMessageList,money,deptName,excel,"2"); this.subSwitch(deptNo,backInfo,errorMessageList,money,info.getDeptName(),excel,"2");
} }
} else { } else {
this.subSwitch(deptNo,backInfo,errorMessageList,money,deptName,excel,"1"); this.subSwitch(deptNo,backInfo,errorMessageList,money,deptName,excel,"1");
...@@ -400,6 +400,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E ...@@ -400,6 +400,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
subInfo.setAdjustMoney(subInfo.getSurMoney().negate()); subInfo.setAdjustMoney(subInfo.getSurMoney().negate());
subInfo.setAfterAdjustMoney(BigDecimal.ZERO); subInfo.setAfterAdjustMoney(BigDecimal.ZERO);
money = subInfo.getSurMoney().add(money); money = subInfo.getSurMoney().add(money);
deptName = subInfo.getDeptName();
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), subInfo.getErrorInfo(),subInfo)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), subInfo.getErrorInfo(),subInfo));
} }
} }
......
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