Commit 94739146 authored by fangxinjiang's avatar fangxinjiang

入职离职限制-fxj

parent 8633f077
...@@ -2170,7 +2170,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2170,7 +2170,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
// 状态为已处理(2) → 需要校验项目档案 // 状态为已处理(2) → 需要校验项目档案
if (CommonConstants.TWO_STRING.equals(processStatus)) { if (CommonConstants.TWO_STRING.equals(processStatus)
&& CommonConstants.ONE_STRING.equals(registration.getFeedbackType())) {
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(registration.getEmpIdcard()); vo.setEmpIdcard(registration.getEmpIdcard());
vo.setDeptNo(registration.getDeptNo()); vo.setDeptNo(registration.getDeptNo());
...@@ -3218,7 +3219,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3218,7 +3219,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
errorList.add(RegistConstants.REGIST_SAME_CHECK); errorList.add(RegistConstants.REGIST_SAME_CHECK);
} }
// 状态为已处理(2) → 需要校验项目档案 // 状态为已处理(2) → 需要校验项目档案
else if (CommonConstants.TWO_STRING.equals(processStatus)) { else if (CommonConstants.TWO_STRING.equals(processStatus)
&& CommonConstants.ONE_STRING.equals(exit.getFeedbackType())) {
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(insert.getEmpIdcard()); vo.setEmpIdcard(insert.getEmpIdcard());
vo.setDeptNo(insert.getDeptNo()); vo.setDeptNo(insert.getDeptNo());
......
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