Commit 9cd0e51a authored by fangxinjiang's avatar fangxinjiang

确认接收校验整合-fxj

parent 1471a062
......@@ -694,7 +694,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
&& !preVo.getContractEnd().equals(preVo.getDispatchPeriodEnd())){
errorMessages.add("合同截止日期与派遣截止日期不一致");
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if (CommonConstants.ONE_STRING.equals(preVo.getContractTerm())){
if (!preVo.getContractDurationYear().equals(preVo.getDispatchPeriodYear())
|| !preVo.getContractDurationMonth().equals(preVo.getDispatchPeriodMonth())){
errorMessages.add("劳务派遣合同需要和标准合同一致");
}
}
// 如果有错误信息,一起返回
if (!errorMessages.isEmpty()) {
return String.join(";", errorMessages);
......
......@@ -1275,6 +1275,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if ("劳务派遣合同".equals(employeeContractPreVo.getContractType())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())){
if (!employeeContractPreVo.getContractDurationYear().equals(employeeContractPreVo.getDispatchPeriodYear())
|| !employeeContractPreVo.getContractDurationMonth().equals(employeeContractPreVo.getDispatchPeriodMonth())){
allErrorMessages.add("劳务派遣合同需要和标准合同一致");
}
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
if (Common.isNotNull(employeeContractPreVo.getContractStart())
......
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