Commit 76f4480f authored by fangxinjiang's avatar fangxinjiang

期缴日期优化-fxj

parent b952da55
......@@ -970,7 +970,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
private void initFundStartDate(TDispatchInfoPreVo preVo) {
if (null == preVo.getFundStartDate()) {
if (null == preVo.getJoinLeaveDate()) {
TEmployeeContractDateVo initDate = new TEmployeeContractDateVo();
//先计算起缴日期 接收方式 0项目配置 自定义必须填写起缴日期
//0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
......@@ -2484,7 +2484,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (CommonConstants.ZERO_STRING.equals(preVo.getIsCreateDate())) {
//原社保起缴日期类型为 0 入职日期 新:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月
// 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
if (Common.isEmpty(preVo.getSocialStartDate())) {
if (!Common.isEmpty(preVo.getJoinLeaveDate())) {
if (Common.isNotNull(preVo.getSocialDateType())){
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
vo.setMonthAfter(Integer.parseInt(preVo.getSocialDateType()));
......
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