Commit b8a7fab0 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-派单暂存

parent 14049543
...@@ -1335,6 +1335,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1335,6 +1335,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
leaveReason = baseSearchVO.getResultIdThree(); leaveReason = baseSearchVO.getResultIdThree();
vo.setLeaveDate(leaveDate); vo.setLeaveDate(leaveDate);
vo.setReduceReason(leaveReason); vo.setReduceReason(leaveReason);
vo.setChangeContractAndEmployee(CommonConstants.ONE_STRING);
} }
if (Common.isNotNull(leaveId)) { if (Common.isNotNull(leaveId)) {
rowLeaveMap.put(i, leaveId); rowLeaveMap.put(i, leaveId);
......
...@@ -697,7 +697,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -697,7 +697,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
List<EmployeeLeaveVO> cachedDataList = new ArrayList<>(); List<EmployeeLeaveVO> cachedDataList = new ArrayList<>();
EmployeeLeaveVO vo; EmployeeLeaveVO vo;
Map<Integer, String> rowLeaveMap = new HashMap<>(); Map<Integer, String> rowLeaveMap = new HashMap<>();
int i=0; int i=1;// 内部是i+2
for (BaseSearchVO param : listParam) { for (BaseSearchVO param : listParam) {
i++; i++;
vo = new EmployeeLeaveVO(); vo = new EmployeeLeaveVO();
......
...@@ -1166,9 +1166,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1166,9 +1166,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
searchVo.setDeptNo(leave.getDeptNo()); searchVo.setDeptNo(leave.getDeptNo());
searchVo.setResultIdOne(leave.getId()); searchVo.setResultIdOne(leave.getId());
if (Common.isNotNull(leave.getLeaveReasonName())) { if (Common.isNotNull(leave.getLeaveReasonName())) {
searchVo.setResultIdThree(leave.getLeaveReasonName()); searchVo.setResultIdThree(leave.getLeaveReasonId());
} else { } else {
searchVo.setResultIdThree(RegistConstants.BASE_REASON_TYPE_NAME); searchVo.setResultIdThree(RegistConstants.BASE_REASON_TYPE);
} }
listParamProject.add(searchVo); listParamProject.add(searchVo);
} }
...@@ -1419,9 +1419,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1419,9 +1419,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setFailEmpProjectRemark(errorMessage); leave.setFailEmpProjectRemark(errorMessage);
leave.setFailEmpProjectTime(LocalDateTime.now()); leave.setFailEmpProjectTime(LocalDateTime.now());
leave.setDoStatusProject(CommonConstants.NINE_STRING); leave.setDoStatusProject(CommonConstants.NINE_STRING);
} else {
leave.setEmpProjectId(leave.getEmpProjectIdOld());
leave.setDoStatusProject(CommonConstants.EIGHT_STRING);
} }
} }
} else { } else {
...@@ -1457,9 +1454,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1457,9 +1454,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave.setFailEmpRemark(errorMessage); leave.setFailEmpRemark(errorMessage);
leave.setFailEmpTime(LocalDateTime.now()); leave.setFailEmpTime(LocalDateTime.now());
leave.setDoStatusEmp(CommonConstants.NINE_STRING); leave.setDoStatusEmp(CommonConstants.NINE_STRING);
} else {
leave.setEmpId(leave.getEmpIdOld());
leave.setDoStatusEmp(CommonConstants.EIGHT_STRING);
} }
} }
} else { } 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