Commit 77cc95be authored by hongguangwu's avatar hongguangwu

代扣社保公积金的加到报账表的社保公积金字段里;

parent 658e11c1
...@@ -572,21 +572,28 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -572,21 +572,28 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
modelPersonSocialFlag = false; modelPersonSocialFlag = false;
personalDebt = personalDebt.add(sai.getSalaryMoney()); personalDebt = personalDebt.add(sai.getSalaryMoney());
sai.setIsTax(CommonConstants.ONE_INT); sai.setIsTax(CommonConstants.ONE_INT);
a.setPersonSocial(sai.getSalaryMoney());
} }
//代扣个人公积金
if (SalaryConstants.WITHHOLIDING_PERSON_FUND.equals(sai.getJavaFiedName())) { if (SalaryConstants.WITHHOLIDING_PERSON_FUND.equals(sai.getJavaFiedName())) {
modelPersonFundFlag = false; modelPersonFundFlag = false;
personalDebt = personalDebt.add(sai.getSalaryMoney()); personalDebt = personalDebt.add(sai.getSalaryMoney());
sai.setIsTax(CommonConstants.ONE_INT); sai.setIsTax(CommonConstants.ONE_INT);
a.setPersonFund(sai.getSalaryMoney());
} }
//个人代扣:李靖2020-6-16 18:16:09提的需求: //个人代扣:李靖2020-6-16 18:16:09提的需求:
if (SalaryConstants.PDEDUCTION_JAVA.equals(sai.getJavaFiedName())) { if (SalaryConstants.PDEDUCTION_JAVA.equals(sai.getJavaFiedName())) {
personalDebt = personalDebt.add(sai.getSalaryMoney()); personalDebt = personalDebt.add(sai.getSalaryMoney());
} }
//代扣单位社保
if (SalaryConstants.WITHHOLIDING_UNIT_SOCIAL.equals(sai.getJavaFiedName())) { if (SalaryConstants.WITHHOLIDING_UNIT_SOCIAL.equals(sai.getJavaFiedName())) {
modelUnitSocialFlag = false; modelUnitSocialFlag = false;
a.setUnitSocial(sai.getSalaryMoney());
} }
//代扣单位公积金
if (SalaryConstants.WITHHOLIDING_UNIT_FUND.equals(sai.getJavaFiedName())) { if (SalaryConstants.WITHHOLIDING_UNIT_FUND.equals(sai.getJavaFiedName())) {
modelUnitFundFlag = false; modelUnitFundFlag = false;
a.setUnitFund(sai.getSalaryMoney());
} }
saiList.add(sai); saiList.add(sai);
//工资应发 //工资应发
......
...@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...@@ -66,7 +65,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -66,7 +65,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
......
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