huyc 项目档案代码提交

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

@@ -197,14 +197,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 			//从剩下的项目档案中查找员工类型并更新
 			if (Common.isNotNull(list)) {
-				for (TEmployeeProject t : list) {
-					if (CommonConstants.ZERO_STRING.equals(t.getEmpNatrue())) {
+				Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
+				if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ZERO_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-						break;
-					} else if (CommonConstants.ONE_STRING.equals(t.getEmpNatrue()) && !CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+				} else if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ONE_STRING))){
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
-						break;
-					}
+				} else {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 				}
 			}
@@ -276,14 +274,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 					//从剩下的项目档案中查找员工类型并更新
 					if (Common.isNotNull(list)) {
-						for (TEmployeeProject t : list) {
-							if (CommonConstants.ZERO_STRING.equals(t.getEmpNatrue())) {
+						Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
+						if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ZERO_STRING))) {
 							tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-								break;
-							} else if (CommonConstants.ONE_STRING.equals(t.getEmpNatrue()) && !CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+						} else if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ONE_STRING))){
 							tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
-								break;
-							}
+						} else {
 							tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 						}
 					}
@@ -311,14 +307,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 				//从剩下的项目档案中查找员工类型并更新
 				if (Common.isNotNull(list)) {
-					for (TEmployeeProject t : list) {
-						if (CommonConstants.ZERO_STRING.equals(t.getEmpNatrue())) {
+					Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
+					if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ZERO_STRING))) {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-							break;
-						} else if (CommonConstants.ONE_STRING.equals(t.getEmpNatrue()) && !CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+					} else if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ONE_STRING))){
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
-							break;
-						}
+					} else {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 					}
 				}
@@ -364,14 +358,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 				//从剩下的项目档案中查找员工类型并更新
 				if (Common.isNotNull(list)) {
-					for (TEmployeeProject t : list) {
-						if (CommonConstants.ZERO_STRING.equals(t.getEmpNatrue())) {
+					Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
+					if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ZERO_STRING))) {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-							break;
-						} else if (CommonConstants.ONE_STRING.equals(t.getEmpNatrue()) && !CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+					} else if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ONE_STRING))){
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
-							break;
-						}
+					} else {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 					}
 				}
@@ -678,6 +670,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			try {
 				if (updateList.size() > CommonConstants.dingleDigitIntArray[0]) {
 					tEmployeeInfoMapper.updateExcelEmployeeInfo(updateList);
+					doJointTask.doUpdateEmployeeInfo(updateList);
 				}
 				if (proInsList.size() > CommonConstants.dingleDigitIntArray[0]) {
 					baseMapper.insertExcelEmpProject(proInsList);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java

@@ -13,6 +13,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 主要执行人员档案的员工类型同步更新
@@ -50,16 +52,15 @@ public class DoJointTask {
 						.eq(TEmployeeProject::getEmpIdcard, tEmployeeInfo.getEmpIdcard())
 						.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 						.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
-				for (TEmployeeProject tEmployeeProject:list) {
-					if (CommonConstants.ZERO_STRING.equals(tEmployeeProject.getEmpNatrue())) {
+				Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
+				if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ZERO_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-						break;
-					} else if (CommonConstants.ONE_STRING.equals(tEmployeeProject.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+				} else if (empNatrue.stream().anyMatch(e-> e.equals(CommonConstants.ONE_STRING))){
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
-						break;
-					}
+				} else {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 				}
+
 				tEmployeeInfoService.updateById(tEmployeeInfo);
 				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0]
 						, tEmployeeInfo.getId(), "", tEmployeeInfoOld, tEmployeeInfo);