Commit 7c6e9199 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-优化代码

parent 746abc42
...@@ -591,6 +591,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -591,6 +591,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
return R.failed("无需处理原因超过200字!"); return R.failed("无需处理原因超过200字!");
} }
if (leave != null) { if (leave != null) {
BaseSearchVO returnVo;
BaseSearchVO paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(registration.getEmpIdcard());
paramVo.setDeptNo(registration.getDeptNo());
StringBuilder errorInfo = new StringBuilder(); StringBuilder errorInfo = new StringBuilder();
StringBuilder logInfo = new StringBuilder("手动关闭:"); StringBuilder logInfo = new StringBuilder("手动关闭:");
if (Common.isNotNull(doTypeWu)) { if (Common.isNotNull(doTypeWu)) {
...@@ -611,9 +616,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -611,9 +616,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
&& !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusEmp())) { && !CommonConstants.EIGHT_STRING.equals(leave.getDoStatusEmp())) {
leave.setCloseRemarkEmp(remark); leave.setCloseRemarkEmp(remark);
leave.setDoStatusEmp(CommonConstants.ONE_STRING); leave.setDoStatusEmp(CommonConstants.ONE_STRING);
String isMultipleDept = CommonConstants.ZERO_STRING;
R<BaseSearchVO> returnR = archivesDaprUtil.getEmpAndContractStatus(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdFour())) {
isMultipleDept = returnVo.getResultIdFour();
}
}
if (CommonConstants.ZERO_STRING.equals(isMultipleDept)) {
errorInfo.append("人员当下非多项目,不可无需处理!");
}
} else { } else {
errorInfo.append("人员档案状态已完结,不可无需处理!"); errorInfo.append("人员档案状态已完结,不可无需处理!");
} }
} }
} }
if (Common.isNotNull(doTypeYi)) { if (Common.isNotNull(doTypeYi)) {
...@@ -621,10 +639,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -621,10 +639,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
logInfo.append("已在其他入口处理:"); logInfo.append("已在其他入口处理:");
String socialDispatchId = ""; String socialDispatchId = "";
String fundDispatchId = ""; String fundDispatchId = "";
BaseSearchVO returnVo;
BaseSearchVO paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(registration.getEmpIdcard());
paramVo.setDeptNo(registration.getDeptNo());
R<BaseSearchVO> returnR = socialDaprUtils.getSocialAndFundStatusByClose(paramVo); R<BaseSearchVO> returnR = socialDaprUtils.getSocialAndFundStatusByClose(paramVo);
if (null != returnR && Common.isNotNull(returnR.getData())) { if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData(); returnVo = returnR.getData();
...@@ -917,6 +931,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -917,6 +931,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setDoStatusInsurance(CommonConstants.TWO_STRING); leave.setDoStatusInsurance(CommonConstants.TWO_STRING);
} else { } else {
this.removeInsuranceToDoType(leave); this.removeInsuranceToDoType(leave);
leave.setDoStatusInsurance(CommonConstants.ONE_STRING);
} }
} }
// 停缴社保日期 // 停缴社保日期
...@@ -1404,21 +1419,28 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1404,21 +1419,28 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
// 项目-完成 // 项目-完成
if (!listParamProject.isEmpty()) { if (!listParamProject.isEmpty()) {
BaseSearchListVO paramVoProject = new BaseSearchListVO(); projectParamList = new ArrayList<>();
List<BaseSearchVO> tempProject;
BaseSearchListVO paramVoProject;
for (BaseSearchVO proVo : listParamProject) {
tempProject = new ArrayList<>();
tempProject.add(proVo);
paramVoProject = new BaseSearchListVO();
paramVoProject.setUserId(user.getId()); paramVoProject.setUserId(user.getId());
paramVoProject.setUserName(user.getNickname()); paramVoProject.setUserName(user.getNickname());
paramVoProject.setListParam(listParamProject); paramVoProject.setListParam(tempProject);
R<BaseSearchListVO> listR = archivesDaprUtil.leaveToReduceProject(paramVoProject); R<BaseSearchListVO> listR = archivesDaprUtil.leaveToReduceProject(paramVoProject);
if (Common.isNotNull(listR) && Common.isNotNull(listR.getData())) { if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().getErrorMessageList().isEmpty()) {
// 部分失败
if (!listR.getData().getErrorMessageList().isEmpty()) {
projectParamList = listR.getData().getErrorMessageList(); projectParamList = listR.getData().getErrorMessageList();
}
}
if (!projectParamList.isEmpty()) {
Map<String, String> errorMap = new HashMap<>(); Map<String, String> errorMap = new HashMap<>();
for (ErrorMessage message : projectParamList) { for (ErrorMessage message : projectParamList) {
errorMap.put(message.getKey(), message.getMessage()); errorMap.put(message.getKey(), message.getMessage());
} }
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (judgeToUpdateProject(doType, leave) ) { if (judgeToUpdateProject(doType, leave)) {
if (errorMap.get(leave.getId()) != null) { if (errorMap.get(leave.getId()) != null) {
errorMessage = errorMap.get(leave.getId()); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) { if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
...@@ -1433,31 +1455,39 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1433,31 +1455,39 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} else { } else {
// 全部成功 // 全部成功
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (judgeToUpdateProject(doType, leave) ) { if (judgeToUpdateProject(doType, leave)) {
leave.setEmpProjectId(leave.getEmpProjectIdOld()); leave.setEmpProjectId(leave.getEmpProjectIdOld());
leave.setDoStatusProject(CommonConstants.EIGHT_STRING); leave.setDoStatusProject(CommonConstants.EIGHT_STRING);
} }
} }
} }
} }
}
// 员工-完成 // 员工-完成
if (!listParamEmp.isEmpty()) { if (!listParamEmp.isEmpty()) {
BaseSearchListVO paramVoEmp = new BaseSearchListVO();
empParamList = new ArrayList<>();
List<BaseSearchVO> tempEmp;
BaseSearchListVO paramVoEmp;
for (BaseSearchVO empVo : listParamEmp) {
tempEmp = new ArrayList<>();
tempEmp.add(empVo);
paramVoEmp = new BaseSearchListVO();
paramVoEmp.setUserId(user.getId()); paramVoEmp.setUserId(user.getId());
paramVoEmp.setUserName(user.getNickname()); paramVoEmp.setUserName(user.getNickname());
paramVoEmp.setListParam(listParamEmp); paramVoEmp.setListParam(tempEmp);
R<BaseSearchListVO> listR = archivesDaprUtil.leaveToReduceEmp(paramVoEmp); R<BaseSearchListVO> listR = archivesDaprUtil.leaveToReduceEmp(paramVoEmp);
if (Common.isNotNull(listR) && Common.isNotNull(listR.getData())) { if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().getErrorMessageList().isEmpty()) {
// 部分失败
if (!listR.getData().getErrorMessageList().isEmpty()) {
empParamList = listR.getData().getErrorMessageList(); empParamList = listR.getData().getErrorMessageList();
}
}
if (!empParamList.isEmpty()) {
Map<String, String> errorMap = new HashMap<>(); Map<String, String> errorMap = new HashMap<>();
for (ErrorMessage message : empParamList) { for (ErrorMessage message : empParamList) {
errorMap.put(message.getKey(), message.getMessage()); errorMap.put(message.getKey(), message.getMessage());
} }
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (judgeToUpdateEmp(doType, leave) ) { if (judgeToUpdateEmp(doType, leave)) {
if (errorMap.get(leave.getId()) != null) { if (errorMap.get(leave.getId()) != null) {
errorMessage = errorMap.get(leave.getId()); errorMessage = errorMap.get(leave.getId());
if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) { if (Common.isNotNull(errorMessage) && errorMessage.length() > 300) {
...@@ -1472,14 +1502,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1472,14 +1502,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} else { } else {
// 全部成功 // 全部成功
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
if (judgeToUpdateEmp(doType, leave) ) { if (judgeToUpdateEmp(doType, leave)) {
leave.setEmpId(leave.getEmpIdOld()); leave.setEmpId(leave.getEmpIdOld());
leave.setDoStatusEmp(CommonConstants.EIGHT_STRING); leave.setDoStatusEmp(CommonConstants.EIGHT_STRING);
} }
} }
} }
} }
}
// 是否返回前端错误信息 // 是否返回前端错误信息
......
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