Commit 90a45159 authored by hongguangwu's avatar hongguangwu

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

parent cb5a2739
......@@ -1041,7 +1041,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// @param isExit: 1仅发起日期为今日及之前的事项 0立即发起(全量)
// * @param doType: 需处理项:1社保2公积金3商险4合同5项目档案6人员档案
private R<List<EmployeeRegistrationLeave>> batchDoLeaveCore(List<EmployeeRegistrationLeave> leaveList, String isExit, String doType, YifuUser user) {
private R<List<EmployeeRegistrationLeave>> batchDoLeaveCore(List<EmployeeRegistrationLeave> leaveList, String isExit
, String doType, YifuUser user) {
if (Common.isEmpty(leaveList)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
......@@ -1058,7 +1059,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
List<BaseSearchVO> listParamProject = new ArrayList<>();
List<BaseSearchVO> listParamEmp = new ArrayList<>();
BaseSearchVO searchVo;
int i = 0;
// 离职待办与商险的映射
Map<String, List<String>> leaveInsuranceMap = new HashMap<>();
// 单一离职待办里的商险
......@@ -1066,7 +1066,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
String[] insuranceArr;
String errorMessage;
for (EmployeeRegistrationLeave leave : leaveList) {
i++;
if ((Common.isEmpty(doType) || doType.contains(CommonConstants.ONE_STRING))
&& Common.isNotNull(leave.getSocialDispatchIdOld()) && (CommonConstants.ZERO_STRING.equals(isExit)
|| (CommonConstants.ONE_STRING.equals(isExit) && leave.getSocialExpectedTime().isBefore(nowTime)))
......@@ -1195,12 +1194,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
//组装返回给前端
List<ErrorMessage> socialParamList = new ArrayList<>();
List<ErrorMessage> fundParamList = new ArrayList<>();
List<ErrorMessage> insuranceParamList = new ArrayList<>();
List<ErrorMessage> contractParamList = new ArrayList<>();
List<ErrorMessage> projectParamList = new ArrayList<>();
List<ErrorMessage> empParamList = new ArrayList<>();
List<ErrorMessage> socialParamList ;
List<ErrorMessage> fundParamList ;
List<ErrorMessage> insuranceParamList ;
List<ErrorMessage> contractParamList ;
List<ErrorMessage> projectParamList ;
List<ErrorMessage> empParamList ;
// 社保-完成
if (!socialOldList.isEmpty()) {
TDispatchReduceListVo paramListVo = new TDispatchReduceListVo();
......@@ -1513,13 +1512,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
leaveLogService.saveBatch(logList);
this.updateBatchById(leaveList);
ErrorInfoVo errorVo = new ErrorInfoVo();
errorVo.setEmpParamList(empParamList);
errorVo.setProjectParamList(projectParamList);
errorVo.setContractParamList(contractParamList);
errorVo.setSocialParamList(socialParamList);
errorVo.setFundParamList(fundParamList);
errorVo.setInsuranceParamList(insuranceParamList);
if (isReturn) {
return R.failed(leaveList, "发起失败!");
} else {
......
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