huyc 项目档案代码提交

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -324,91 +324,66 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		// 新老项目档案List
 		List<EmployeeProjectNewOldVO> updateProjectList = new ArrayList<>();
 
-		List<EmployeeXProjectVO> selectList = excelVOList.stream().filter(e -> e.getIsLeaveEmployee().equals(CommonConstants.IS_TRUE)).collect(Collectors.toList());
-
-		List<TEmployeeProject> checkList = new ArrayList<>();
 		// 执行数据插入操作 组装 PostDto
 		for (int i = 0; i < excelVOList.size(); i++) {
 			EmployeeXProjectVO excel = excelVOList.get(i);
 
+			List<TEmployeeProject> idList = new ArrayList<>();
 			//根据身份证和项目编码获取项目档案
 			TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
 					.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard())
 					.eq(TEmployeeProject::getDeptNo, excel.getDeptNo())
-					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL));
+					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
+					.eq(TEmployeeProject::getProjectStatus, CommonConstants.STATUS_NORMAL));
 
-			TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-			TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
 			if (Common.isNotNull(tEmployeeProject)) {
 				if (tEmployeeProject.getInsuranceStatus() != CommonConstants.dingleDigitIntArray[0] || tEmployeeProject.getSocialStatus() != CommonConstants.dingleDigitIntArray[0] ||
 						tEmployeeProject.getFundStatus() != CommonConstants.dingleDigitIntArray[0]) {
+
+					idList.add(tEmployeeProject);
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST)));
-				} else if (CommonConstants.IS_TRUE.equals(excel.getIsLeaveEmployee())) {
+				} else {
+					TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
+					tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
+					tEmployeeProject.setLeaveReason(excel.getLeaveReason());
+					tEmployeeProject.setLeaveRemark(excel.getLeaveRemark());
+					tEmployeeProject.setLeaveTime(LocalDateTime.now());
+					updProjectList.add(tEmployeeProject);
 
-					//查询该人员其他的项目档案
+					newOldProject = new EmployeeProjectNewOldVO();
+					newOldProject.setOldProjectEmployee(tEmployeeProjectOld);
+					newOldProject.setNewProjectEmployee(tEmployeeProject);
+					updateProjectList.add(newOldProject);
+
+					//查询该人员所有的项目档案
 					List<TEmployeeProject> list = this.list(Wrappers.<TEmployeeProject>query().lambda()
-							.ne(TEmployeeProject::getDeptNo, tEmployeeProject.getDeptNo())
 							.eq(TEmployeeProject::getEmpIdcard, tEmployeeProject.getEmpIdcard())
 							.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 							.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 
-					TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
 					if (Common.isNotNull(list)) {
-						boolean flag = false;
 						for (TEmployeeProject tEmployeeProject1 : list) {
-							if (!selectList.stream().anyMatch(e -> saveCheck(e, tEmployeeProject1))) {
-								checkList.add(tEmployeeProject1);
-								flag = true;
-							}
-						}
-						if (flag) {
-							boolean checkUpd = false;
-							for (TEmployeeProject tEmployeeCheck : checkList) {
-								if (tEmployeeCheck.getInsuranceStatus() != CommonConstants.dingleDigitIntArray[0] || tEmployeeCheck.getSocialStatus() != CommonConstants.dingleDigitIntArray[0] ||
-										tEmployeeCheck.getFundStatus() != CommonConstants.dingleDigitIntArray[0]) {
-									errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.QT_PROJECT_CHANGE_NOT_EXIST)));
-									checkUpd = true;
-									break;
+							if (!excelVOList.stream().anyMatch(e -> saveCheck(e, tEmployeeProject1))) {
+								idList.add(tEmployeeProject1);
 							}
 						}
-							if (!checkUpd) {
-								tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-								tEmployeeInfo.setLeaveReason(excel.getLeaveReason());
-								tEmployeeInfo.setLeaveRemark(excel.getLeaveRemark());
-								tEmployeeInfo.setLeaveTime(LocalDateTime.now());
-
-								List<String> idList = list.stream().map(TEmployeeProject::getId).collect(Collectors.toList());
-								//从剩下的项目档案中查找员工类型并更新
-								setEmpNature(tEmployeeProject.getEmpIdcard(), tEmployeeInfo, idList);
-								updList.add(tEmployeeInfo);
 					}
 				}
 			} else {
-						tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-						tEmployeeInfo.setLeaveReason(excel.getLeaveReason());
-						tEmployeeInfo.setLeaveRemark(excel.getLeaveRemark());
-						tEmployeeInfo.setLeaveTime(LocalDateTime.now());
-						updList.add(tEmployeeInfo);
+				idList.add(tEmployeeProject);
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_SEARCH_EXIT)));
 			}
+			TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
+			TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
+			List<String> projectIdList = idList.stream().map(TEmployeeProject::getId).collect(Collectors.toList());
+			//从剩下的项目档案中查找员工类型并更新
+			setEmpNature(tEmployeeProject.getEmpIdcard(), tEmployeeInfo, projectIdList);
+			updList.add(tEmployeeInfo);
 			newOld = new EmployeeNewOldVO();
 			newOld.setOldEmployee(tEmployeeInfoOld);
 			newOld.setNewEmployee(tEmployeeInfo);
 			updateList.add(newOld);
 		}
-				tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
-				tEmployeeProject.setLeaveReason(excel.getLeaveReason());
-				tEmployeeProject.setLeaveRemark(excel.getLeaveRemark());
-				tEmployeeProject.setLeaveTime(LocalDateTime.now());
-				updProjectList.add(tEmployeeProject);
-
-				newOldProject = new EmployeeProjectNewOldVO();
-				newOldProject.setOldProjectEmployee(tEmployeeProjectOld);
-				newOldProject.setNewProjectEmployee(tEmployeeProject);
-				updateProjectList.add(newOldProject);
-			} else {
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_SEARCH_EXIT)));
-			}
-		}
 		if (errorMessageList.size() > CommonConstants.ZERO_INT) {
 			return R.failed(errorMessageList);
 		} else {
@@ -433,7 +408,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			if (updateProjectList.size() > CommonConstants.dingleDigitIntArray[0]) {
 				for (EmployeeProjectNewOldVO newOldVO : updateProjectList) {
 					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1]
-							, "", newOldVO.getNewProjectEmployee().getId()
+							,"", newOldVO.getNewProjectEmployee().getId()
 							, newOldVO.getOldProjectEmployee(), newOldVO.getNewProjectEmployee());
 				}
 			}
@@ -1075,7 +1050,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	//从剩下的项目档案中查找员工类型
 	public void setEmpNature(String empIdcard, TEmployeeInfo tEmployeeInfo, List<String> idlist) {
 		List<TEmployeeProject> list = this.list(Wrappers.<TEmployeeProject>query().lambda()
-				.notIn(TEmployeeProject::getId, idlist)
+				.in(TEmployeeProject::getId, idlist)
 				.eq(TEmployeeProject::getEmpIdcard, empIdcard)
 				.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 				.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));