Commit 404aa084 authored by hongguangwu's avatar hongguangwu

合同申请提交拦截

parent db56e5d0
......@@ -216,9 +216,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.eq(TEmployeeContractInfo::getDeptNo, tEmployeeContractInfo.getDeptNo())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
if (contractInfo != null && (contractInfo.getContractEnd() == null
if (contractInfo == null) {
return R.failed("无在用合同,无法续签");
} else if (contractInfo.getContractEnd() == null
|| !(DateUtil.formatDate(DateUtil.addDayByDate(contractInfo.getContractEnd(),1)).equals(DateUtil.formatDate(tEmployeeContractInfo.getContractStart())))
)) {
) {
return R.failed("续签请注意上一份合同的截止日期!");
}
} else if (EmployeeConstants.SITUATION_THREE.equals(tEmployeeContractInfo.getSituation())) {
......
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