Commit 8cedfc67 authored by hongguangwu's avatar hongguangwu

MVP1.5.4-SALARY实发倒推应发最后提交

parent b076574f
...@@ -1214,7 +1214,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1214,7 +1214,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
} }
//历史累计 //历史累计
for (TSalaryAccountItem item : itemHistoryList) { for (TSalaryAccountItem item : itemHistoryList) {
if (CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) { if (CommonConstants.ONE_STRING.equals(item.getAnnualBonusType())) {
if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
annualBonus = annualBonus.add(item.getSalaryMoney()); annualBonus = annualBonus.add(item.getSalaryMoney());
} }
......
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