Commit 5aedee18 authored by fangxinjiang's avatar fangxinjiang

日志优化-fxj

parent 14da156a
...@@ -1212,10 +1212,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1212,10 +1212,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
&& Common.isEmpty(employeeContractPreVo.getContractDurationMonth())) { && Common.isEmpty(employeeContractPreVo.getContractDurationMonth())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate()); employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
} }
//试用期开始日期、试用期截止日期 //试用期开始日期、试用期截止日期 20260512 试用期为是的时候才去生成试用期
if (Common.isEmpty(employeeContractPreVo.getTryPeriodStart()) if (Common.isEmpty(employeeContractPreVo.getTryPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getTryPeriodNum()) && Common.isNotNull(employeeContractPreVo.getTryPeriodNum())
&& CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getSignType())) { && CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getSignType())
&& CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getTryPeriodType())) {
employeeContractPreVo.setTryPeriodStart(employeeContractPreVo.getJoinLeaveDate()); employeeContractPreVo.setTryPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getTryPeriodNum())); vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getTryPeriodNum()));
vo.setYearAfter(0); vo.setYearAfter(0);
......
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