Commit efab44f3 authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 47656659
...@@ -258,9 +258,8 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -258,9 +258,8 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
} }
} }
//电子签判断合同开始时间是否为当前时间的一个月前 //电子签判断合同开始时间是否为当前时间的一个月前
if (Common.isNotNull(preVo.getExpectedCollectionTime()) if (Common.isNotNull(preVo.getContractStart())
&& CommonConstants.ZERO_STRING.equals(preVo.getSignType()) && CommonConstants.ZERO_STRING.equals(preVo.getSignType())){
&& null != preVo.getContractStart()){
LocalDate reminderDate = LocalDateUtil.parseLocalDate(DateUtil.dateToString(preVo.getContractStart(), DateUtil.ISO_EXPANDED_DATE_FORMAT)); LocalDate reminderDate = LocalDateUtil.parseLocalDate(DateUtil.dateToString(preVo.getContractStart(), DateUtil.ISO_EXPANDED_DATE_FORMAT));
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
if (null != nowDate && nowDate.isAfter(reminderDate.plusMonths(1))){ if (null != nowDate && nowDate.isAfter(reminderDate.plusMonths(1))){
......
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