Commit ddd8670d authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 9a8934dc
...@@ -279,7 +279,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -279,7 +279,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
} }
//判断两个合同时间是否重合 //判断两个合同时间是否重合
if (LocalDateUtil.hasOverlap(contract.getContractStart(),contract.getContractEnd(),preVo.getContractStart(),preVo.getContractEnd())){ if (LocalDateUtil.hasOverlap(contract.getContractStart(),contract.getContractEnd(),preVo.getContractStart(),preVo.getContractEnd())){
return R.failed("发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签"); return R.failed(EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO);
} }
TEmpContractAlert alert = empContractAlertMapper.selectOne(Wrappers.<TEmpContractAlert>query().lambda() TEmpContractAlert alert = empContractAlertMapper.selectOne(Wrappers.<TEmpContractAlert>query().lambda()
.eq(TEmpContractAlert::getContractId,preVo.getContractId()) .eq(TEmpContractAlert::getContractId,preVo.getContractId())
...@@ -504,7 +504,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -504,7 +504,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
return buildErrorCheckVo(contract, preVoTemp, "续签合同开始日期解析失败"); return buildErrorCheckVo(contract, preVoTemp, "续签合同开始日期解析失败");
} }
if (reminderDate.isAfter(contractStartDateNew.plusMonths(1))) { if (reminderDate.isAfter(contractStartDateNew.plusMonths(1))) {
return buildErrorCheckVo(contract, preVoTemp, EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR); return buildErrorCheckVo(contract, preVoTemp, EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO);
} }
} }
//reminderDate 设置15:20 //reminderDate 设置15:20
...@@ -828,7 +828,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -828,7 +828,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, "发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签") .set(TEmployeeContractPreNew::getErrorInfo, EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO)
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now()));
this.update(updateWrapper); this.update(updateWrapper);
...@@ -839,12 +839,12 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -839,12 +839,12 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
contractAutoLog.setEmpName(contractPre.getEmployeeName()); contractAutoLog.setEmpName(contractPre.getEmployeeName());
contractAutoLog.setEmpIdcard(contractPre.getEmpIdcard()); contractAutoLog.setEmpIdcard(contractPre.getEmpIdcard());
contractAutoLog.setMainId(contractPre.getId()); contractAutoLog.setMainId(contractPre.getId());
contractAutoLog.setErrorInfo("发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签"); contractAutoLog.setErrorInfo(EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO);
contractAutoLogService.save(contractAutoLog); contractAutoLogService.save(contractAutoLog);
} }
// 添加错误信息 // 添加错误信息
ErrorMessage<EmployeeContractVO> errorMessage = new ErrorMessage<>(contractVO.getRowIndex(), "发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签"); ErrorMessage<EmployeeContractVO> errorMessage = new ErrorMessage<>(contractVO.getRowIndex(), EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO);
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
errorMessageListAll.add(errorMessage); errorMessageListAll.add(errorMessage);
} else { } else {
......
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