Commit 0e4c717c authored by hongguangwu's avatar hongguangwu

MVP1.7.17-2000改为5条

parent 663154ef
...@@ -607,19 +607,20 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -607,19 +607,20 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
logInfo.append("无需处理标记:"); logInfo.append("无需处理标记:");
if (doTypeWu.contains(CommonConstants.THREE_STRING)) { if (doTypeWu.contains(CommonConstants.THREE_STRING)) {
logInfo.append("商险;"); logInfo.append("商险;");
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusInsurance()) if (CommonConstants.TWO_STRING.equals(leave.getDoStatusInsurance())
&& !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusInsurance())) { || CommonConstants.THREE_STRING.equals(leave.getDoStatusInsurance())
|| CommonConstants.NINE_STRING.equals(leave.getDoStatusInsurance())) {
leave.setInsuranceId(leave.getInsuranceIdOld()); leave.setInsuranceId(leave.getInsuranceIdOld());
leave.setCloseRemarkInsurance(remark); leave.setCloseRemarkInsurance(remark);
leave.setDoStatusInsurance(CommonConstants.ONE_STRING); leave.setDoStatusInsurance(CommonConstants.ONE_STRING);
} else { } else {
errorInfo.append("商险状态已完结,不可无需处理!"); errorInfo.append("商险状态已处理,不可手动关闭!");
} }
} }
if (doTypeWu.contains(CommonConstants.SIX_STRING)) { if (doTypeWu.contains(CommonConstants.SIX_STRING)) {
logInfo.append("人员档案;"); logInfo.append("人员档案;");
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusEmp()) if (CommonConstants.TWO_STRING.equals(leave.getDoStatusEmp())
&& !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusEmp())) { || CommonConstants.NINE_STRING.equals(leave.getDoStatusEmp())) {
leave.setEmpId(leave.getEmpIdOld()); leave.setEmpId(leave.getEmpIdOld());
leave.setCloseRemarkEmp(remark); leave.setCloseRemarkEmp(remark);
leave.setDoStatusEmp(CommonConstants.ONE_STRING); leave.setDoStatusEmp(CommonConstants.ONE_STRING);
...@@ -636,7 +637,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -636,7 +637,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
errorInfo.append("人员当下非多项目,不可无需处理!"); errorInfo.append("人员当下非多项目,不可无需处理!");
} }
} else { } else {
errorInfo.append("人员档案状态已完结,不可无需处理!"); errorInfo.append("人员状态已处理,不可手动关闭!");
} }
} }
......
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