Commit c143ecbe authored by hongguangwu's avatar hongguangwu

代扣单位社保不为0也传

parent 0df7c9a1
...@@ -542,13 +542,17 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -542,13 +542,17 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
account = new TSalaryAccount(); account = new TSalaryAccount();
account.setId(sendParam.getFd_3b10af838eab5c()); account.setId(sendParam.getFd_3b10af838eab5c());
// 社保 // 社保
if (Common.isNotNull(sendParam.getFd_3b16ce48a9735c()) if ((Common.isNotNull(sendParam.getUnitSocial())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c())) { && !CommonConstants.ZERO_STRING.equals(sendParam.getUnitSocial()))
||(Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c()))) {
doSendForecastSocialToEkp(sendParam, s); doSendForecastSocialToEkp(sendParam, s);
} }
// 公积金 // 公积金
if (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a()) if ((Common.isNotNull(sendParam.getUnitFund())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a())) { && !CommonConstants.ZERO_STRING.equals(sendParam.getUnitFund()))
|| (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a()))) {
doSendForecastFundToEkp(sendParam, s); doSendForecastFundToEkp(sendParam, s);
} }
sendBack = ekpSalaryUtil.sendToEKP(salaryParam); sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
......
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