Commit 6df9ea81 authored by hongguangwu's avatar hongguangwu

MVP1.5.4-SALARY实发倒推应发初次提交

parent b97f90bd
......@@ -19,15 +19,6 @@ public class EkpSalaryParamVo extends EkpSalaryParam {
* 公积金扣缴月份
**/
private String deduProvidentMonth;
/**
* 代扣单位社保
**/
private String unitSocial;
/**
* 代扣单位公积金
**/
private String unitFund;
/**
* 代扣社保总额
**/
......
......@@ -1178,6 +1178,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
// +累计年金(个人含本期)+累计个人代扣(各类个人代扣费用,含本期)+免个税个人代扣(含本期)】
// - costReduction - specialDeductionSum
BigDecimal relaySalaryHistory = SalaryConstants.B_ZERO; // 历史应发
BigDecimal taxHistory = SalaryConstants.B_ZERO; // 历史个税
//本次
for (TSalaryAccountItem item : itemList) {
if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName()) && CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) {
......@@ -1211,6 +1212,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
sumTax = sumTax.add(item.getSalaryMoney());
taxHistory = taxHistory.add(item.getSalaryMoney());
}
if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) {
res = res.add(item.getSalaryMoney());
......@@ -1273,7 +1275,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
&& areaMoney.compareTo(sub.getMaxIncome()) <= SalaryConstants.EQUAL) {
// 3 计算应缴税所得额(参与计税的金额)= (税率档位-速算扣除数)/(1—税率)
doTaxMoney = (areaMoney.subtract(sub.getQuickDeducation())).divide(SalaryConstants.B_ONEHUNDRED.subtract(new BigDecimal(sub.getWithholdingRate())).divide(
SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP), SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
break;
}
}
......@@ -1299,7 +1301,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (relaySalaryNow.compareTo(actualSalaryNow) <= SalaryConstants.EQUAL) {
relaySalaryNow = actualSalaryNow;
}
res = relaySalaryNow.subtract(actualSalaryNow);
res = taxAll.subtract(taxHistory);
// 本次个人应发合计
TSalaryAccountItem sai = new TSalaryAccountItem();
sai.setCnName(SalaryConstants.RELAY_SALARY);
......
......@@ -408,15 +408,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
account.setId(sendParam.getFd_3b10af838eab5c());
// 社保
if ((Common.isNotNull(sendParam.getUnitSocial())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitSocial()))
if ((Common.isNotNull(sendParam.getFd_3bcd41d857b764())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3bcd41d857b764()))
||(Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c()))) {
doSendForecastSocialToEkp(sendParam, s);
}
// 公积金
if ((Common.isNotNull(sendParam.getUnitFund())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitFund()))
if ((Common.isNotNull(sendParam.getFd_3bcd41d77e4812())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3bcd41d77e4812()))
|| (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a()))) {
doSendForecastFundToEkp(sendParam, s);
......@@ -627,7 +627,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
// 生成月份
socialParam.setFd_3adfe8cb96c41e(account.getDeduSocialMonth());
// 预估单位合计
socialParam.setFd_3adfeb4e8064a8(account.getUnitSocial());
socialParam.setFd_3adfeb4e8064a8(account.getFd_3bcd41d857b764());
// 预估个人合计
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce48a9735c());
//应收
......@@ -763,7 +763,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
//员工身份证
socialParam.setFd_3adfe8c7e4cf7a(account.getFd_3adfedfb8f76d4());
// 预估单位代缴
socialParam.setFd_3adfeb4e8064a8(account.getUnitFund());
socialParam.setFd_3adfeb4e8064a8(account.getFd_3bcd41d77e4812());
// 预估个人代缴
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce4b7fc42a());
//应收
......
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