Commit e745fbfb authored by chenyuxi's avatar chenyuxi

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents ac0fdef4 e56ee6b9
...@@ -783,7 +783,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -783,7 +783,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo)); employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
} }
//实习开始日期、实习结束日期 //实习开始日期、实习结束日期
//实习开始日期、实习结束日期
if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart()) if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) { && Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) {
employeeContractPreVo.setInternshipPeriodStart(employeeContractPreVo.getJoinLeaveDate()); employeeContractPreVo.setInternshipPeriodStart(employeeContractPreVo.getJoinLeaveDate());
...@@ -792,6 +791,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -792,6 +791,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setRegistDate(employeeContractPreVo.getInternshipPeriodStart()); vo.setRegistDate(employeeContractPreVo.getInternshipPeriodStart());
employeeContractPreVo.setInternshipPeriodEnd(this.addYearsMonths(vo)); employeeContractPreVo.setInternshipPeriodEnd(this.addYearsMonths(vo));
} }
//合同岗位名称
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getPostType())
&& Common.isEmpty(employeeContractPreVo.getPost())) {
employeeContractPreVo.setPost(registration.getPosition());
}
// 预计提醒时间、预计合同发起时间 // 预计提醒时间、预计合同发起时间
employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE)); employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE));
......
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