Skip to content

Y
yifu-mvp
Commit b7890a92 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

parents 8c81bd17 4e061369
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @ b7890a92
...@@ -1777,14 +1777,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1777,14 +1777,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
} else { } else {
// 2个人承担全部 // 2个人承担全部
//个人承担全部税费，实发要变为应发，推算出实发、个税 //个人承担全部税费，实发要变为应发，推算出实发、个税
nowTaxY = getNowTax(actualSalarySum); nowTaxY = getNowTaxNew(actualSalarySum);
if (sumOtherTax.compareTo(BigDecimal.ZERO) != 0) { if (sumOtherTax.compareTo(BigDecimal.ZERO) != 0) {
//历史应发税费 //历史应发税费
nowTaxY = BigDecimalUtils.safeSubtract(false,nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP); nowTaxY = BigDecimalUtils.safeSubtract(false,nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
} }
//公司应发和个人实收 //公司应发和个人实收
relaySalary = BigDecimalUtils.safeSubtract(false,actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP); relaySalary = actualSalarySumNow;
a.setActualSalary(relaySalary); a.setActualSalary(BigDecimalUtils.safeSubtract(false,actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP));
a.setSalaryTax(nowTaxY); a.setSalaryTax(nowTaxY);
} }
a.setRelaySalaryUnit(relaySalary); a.setRelaySalaryUnit(relaySalary);
......
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