Commit f6f04a2f authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 36c907b8
...@@ -695,8 +695,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -695,8 +695,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) && flag) { if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) && flag) {
return R.failed("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”"); return R.failed("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”");
} }
initContractPreInfo(employeeRegistrationPre,employeeContractPreVo, user, id); if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) || CommonConstants.EMPTY_STRING.equals(employeeContractPreVo.getContractFlag())) {
employeeRegistrationPre.setEmployeeContractPre(employeeContractPreVo); initContractPreInfo(employeeRegistrationPre,employeeContractPreVo, user, id);
employeeRegistrationPre.setEmployeeContractPre(employeeContractPreVo);
} else {
employeeRegistrationPre.setEmployeeContractPre(null);
}
} }
//操作记录中字典值的转化 //操作记录中字典值的转化
......
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