Commit 487ef7ea authored by hongguangwu's avatar hongguangwu

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

parent c691fe61
...@@ -1186,7 +1186,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1186,7 +1186,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
annualBonus = item.getSalaryMoney(); annualBonus = item.getSalaryMoney();
} }
if (SalaryConstants.ANNUAL_BONUS_TAX.equals(item.getJavaFiedName())) { if (SalaryConstants.ANNUAL_BONUS_TAX_JAVA.equals(item.getJavaFiedName())) {
annualBonusTax = item.getSalaryMoney(); annualBonusTax = item.getSalaryMoney();
} }
} }
...@@ -1217,7 +1217,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1217,7 +1217,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
annualBonus = item.getSalaryMoney(); annualBonus = item.getSalaryMoney();
} }
if (SalaryConstants.ANNUAL_BONUS_TAX.equals(item.getJavaFiedName())) { if (SalaryConstants.ANNUAL_BONUS_TAX_JAVA.equals(item.getJavaFiedName())) {
annualBonusTax = item.getSalaryMoney(); annualBonusTax = 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