Commit c9b479d5 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent a85a706a
......@@ -731,7 +731,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
//合同开始日期、合同截止日期--
//合同开始日期、合同截止日期
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isEmpty(employeeContractPreVo.getContractDurationYear())
......@@ -745,10 +745,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpDeptContractInfoVo returnVo = info.getData();
employeeContractPreVo.setContractEnd(returnVo.getContractEndTime());
employeeContractPreVo.setContractEndType(returnVo.getContractType());
} else {
employeeContractPreVo.setContractEnd(null);
employeeContractPreVo.setContractEndType(null);
}
}
//合同年限推算
......@@ -789,9 +787,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setRegistDate(employeeContractPreVo.getDispatchPeriodStart());
employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
}
//实习开始日期、实习结束日期赋值合同开始、截止日期
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodStart())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getInternshipPeriodStart());
}
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodEnd())) {
employeeContractPreVo.setContractEnd(employeeContractPreVo.getInternshipPeriodEnd());
}
//实习开始日期、实习结束日期
if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) {
......@@ -801,6 +803,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setYearAfter(0);
vo.setRegistDate(employeeContractPreVo.getInternshipPeriodStart());
employeeContractPreVo.setInternshipPeriodEnd(this.addYearsMonths(vo));
employeeContractPreVo.setContractEnd(employeeContractPreVo.getInternshipPeriodEnd());
}
//合同岗位名称
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getPostType())
......
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