Commit bd084796 authored by fangxinjiang's avatar fangxinjiang

交行jar引入-fxj

parent c15665c3
...@@ -889,15 +889,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -889,15 +889,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){ if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date); date = DateUtil.getFirstDay(date);
} }
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); preVo.setFundStartDate(date);
dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date);
dayVo.setRegistType(0);
R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getContractAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())) {
preVo.setFundStartDate(dataR.getData().getRegistDate());
}
} }
} }
......
...@@ -363,7 +363,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -363,7 +363,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
vo.setYearAfter(0); vo.setYearAfter(0);
vo.setRegistDate(preVo.getFundStartDate()); vo.setRegistDate(preVo.getFundStartDate());
}else { }else {
if (null == preVo.getFundDateType()){ if (null == preVo.getFundStartDate()){
//先计算起缴日期 //先计算起缴日期
if (CommonConstants.ZERO_STRING.equals(preVo.getFundDateType())){ if (CommonConstants.ZERO_STRING.equals(preVo.getFundDateType())){
//用户选择起缴日期类型为入职日期,以入职日期为基准 //用户选择起缴日期类型为入职日期,以入职日期为基准
......
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