Commit 80da7edd authored by hongguangwu's avatar hongguangwu

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

parents 559f1f53 179eb294
...@@ -108,6 +108,8 @@ public class EmployeeConstants { ...@@ -108,6 +108,8 @@ public class EmployeeConstants {
public static final String DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR = "待续签合同超期一个月,需走线下签"; public static final String DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR = "待续签合同超期一个月,需走线下签";
public static final String DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO = "发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签";
public static final String ERROR_TYPE_CONTRACT = "合同"; public static final String ERROR_TYPE_CONTRACT = "合同";
public static final String ERROR_DUPLICATE_CONFIRM = "已确认,请勿重复确认"; public static final String ERROR_DUPLICATE_CONFIRM = "已确认,请勿重复确认";
public static final String ERROR_NO_ALERT_FOUND = "未找到合同续签待办信息"; public static final String ERROR_NO_ALERT_FOUND = "未找到合同续签待办信息";
......
...@@ -264,7 +264,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -264,7 +264,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
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))){
return R.failed(EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR); return R.failed(EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO);
} }
} }
////如果电子签是系统自动撤销对应的签署方式必须更新为 线下签 ////如果电子签是系统自动撤销对应的签署方式必须更新为 线下签
......
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