From 42d1da6ad4334479e44b9029ed0646879e24361f Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 08:16:53 +0800
Subject: [PATCH] feat(hr): 添加人员基本信息模块实现
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 542 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 398 insertions(+), 144 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 6656212..a00d17f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -494,185 +494,439 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
+ // ========== 优化1：批量预加载员工数据 ==========
+ Set<String> empNumbs = new HashSet<>();
for (List<Object> list : listObject) {
- if (list.size() == 0) {
+ if (list.isEmpty()) continue;
+ String empNumb = getImportCellValue(list, 1);
+ if (StringUtils.isNotBlank(empNumb)) {
+ empNumbs.add(empNumb);
+ }
+ }
+
+ // 批量查询已存在的员工，构建Map
+ Map<String, EmpBaseInfo> empMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(empNumbs)) {
+ List<EmpBaseInfo> existEmps = this.list(
+ new LambdaQueryWrapper<EmpBaseInfo>()
+ .in(EmpBaseInfo::getEmpNumb, empNumbs)
+ );
+ empMap = existEmps.stream()
+ .collect(Collectors.toMap(EmpBaseInfo::getEmpNumb, e -> e));
+ }
+
+ // 批量查询身份证号重复情况
+ Map<String, Long> certCountMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(empNumbs)) {
+ List<EmpBaseInfo> certCheckList = this.list(
+ new LambdaQueryWrapper<EmpBaseInfo>()
+ .select(EmpBaseInfo::getCertificateNumb)
+ .in(EmpBaseInfo::getCertificateNumb, empNumbs)
+ .ne(EmpBaseInfo::getDelFlag, 1)
+ );
+ certCountMap = certCheckList.stream()
+ .filter(e -> StringUtils.isNotBlank(e.getCertificateNumb()))
+ .collect(Collectors.groupingBy(
+ EmpBaseInfo::getCertificateNumb,
+ Collectors.counting()
+ ));
+ }
+
+ // ========== 优化2：部门/岗位数据提前转Map ==========
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (CollUtil.isEmpty(depts)) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ Map<String, Dept> deptMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(depts)) {
+ deptMap = depts.stream()
+ .collect(Collectors.toMap(Dept::getDeptName, d -> d, (v1, v2) -> v1));
+ }
+
+ List<Position> positionList = CastUtil.castList(redisService.get("position"), Position.class);
+ if (CollUtil.isEmpty(positionList)) {
+ positionList = remotePositionService.setPositionRedis();
+ }
+ Map<String, Position> positionMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(positionList)) {
+ positionMap = positionList.stream()
+ .collect(Collectors.toMap(Position::getPositionName, p -> p, (v1, v2) -> v1));
+ }
+
+ // ========== 优化3：字典数据转Map ==========
+ Map<String, Map<String, DicItem>> dicMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(dicItems)) {
+ dicMap = dicItems.stream()
+ .collect(Collectors.groupingBy(
+ DicItem::getDicCode,
+ Collectors.toMap(DicItem::getDicItemName, d -> d, (v1, v2) -> v1)
+ ));
+ }
+
+ String operatorId = FebsUtil.getUserId();
+
+ // 分离新增和更新的数据
+ List<EmpBaseInfo> newEmpList = new ArrayList<>();
+ List<EmpBaseInfo> updateEmpList = new ArrayList<>();
+
+ // ========== 循环处理（保留原有逻辑）==========
+ for (int i = 0; i < listObject.size(); i++) {
+ List<Object> list = listObject.get(i);
+ if (list.isEmpty()) {
continue;
}
- if (this.count(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getEmpNumb, list.get(1).toString()).ne(EmpBaseInfo::getDelFlag, 1)) > 0) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}员工编号重复", listObject.indexOf(list) + 1, list.get(1).toString()));
+
+ String empNumb = getImportCellValue(list, 1);
+
+ // ⚡ 从Map获取，不再查询数据库
+ EmpBaseInfo dbData = empMap.get(empNumb);
+ boolean isNew = dbData == null;
+
+ // ⚡ 从Map检查身份证重复
+ if (isNew && certCountMap.getOrDefault(empNumb, 0L) > 0) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}身份证号重复", i + 1, empNumb));
continue;
}
- if (this.count(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getCertificateNumb, list.get(1).toString()).ne(EmpBaseInfo::getDelFlag, 1)) > 0) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}身份证号重复", listObject.indexOf(list) + 1, list.get(1).toString()));
- continue;
- }
- EmpBaseInfo empBaseInfo = new EmpBaseInfo();
- empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empBaseInfo.setArchivesNumb(list.get(0).toString());
- empBaseInfo.setEmpNumb(list.get(1).toString());
-
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if (null == depts) {
- depts = remoteDeptService.setDeptRedis();
- }
- if (null == depts) {
- depts = remoteDeptService.setDeptRedis();
- }
- empBaseInfo.setDeptName(list.get(2).toString());
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(2).toString())).findFirst().orElse(null);
- if (null == dept) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(2).toString()));
- continue;
+
+ EmpBaseInfo empBaseInfo = isNew ? new EmpBaseInfo() : dbData;
+ if (isNew) {
+ empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
}
- empBaseInfo.setAllDeptName(dept.getAllDeptName());
+ String archivesNumb = getImportCellValue(list, 0);
+ if (isNew || StringUtils.isNotBlank(archivesNumb)) {
+ empBaseInfo.setArchivesNumb(archivesNumb);
+ }
+ if (isNew || StringUtils.isNotBlank(empNumb)) {
+ empBaseInfo.setEmpNumb(empNumb);
+ }
- empBaseInfo.setDeptId(dept.getDeptId());
- List<Position> positionList = CastUtil.castList(redisService.get("position"), Position.class);
- if (null == positionList) {
- positionList = remotePositionService.setPositionRedis();
- if (null == positionList) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空，请设置岗位", listObject.indexOf(list) + 1, list.get(3).toString()));
+ String deptName = getImportCellValue(list, 2);
+ if (isNew || StringUtils.isNotBlank(deptName)) {
+ // ⚡ 使用Map查找
+ Dept dept = deptMap.get(deptName);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在", i + 1, deptName));
continue;
}
+
+ empBaseInfo.setDeptName(deptName);
+ empBaseInfo.setAllDeptName(dept.getAllDeptName());
+ empBaseInfo.setDeptId(dept.getDeptId());
}
- Position position = positionList.stream().filter(d -> d.getPositionName().equals(list.get(3).toString())).findFirst().orElse(null);
- if (null == position) {
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空", listObject.indexOf(list) + 1, list.get(3).toString()));
- continue;
+
+ String jobName = getImportCellValue(list, 3);
+ if (isNew || StringUtils.isNotBlank(jobName)) {
+ // ⚡ 使用Map查找
+ Position position = positionMap.get(jobName);
+ if (null == position) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空", i + 1, jobName));
+ continue;
+ }
+ empBaseInfo.setJobId(position.getPositionId());
+ empBaseInfo.setJobName(jobName);
}
- empBaseInfo.setJobId(position.getPositionId());
- empBaseInfo.setJobName(list.get(3).toString());
- empBaseInfo.setEmpName(list.get(4).toString());
+
+ String empName = getImportCellValue(list, 4);
+ if (isNew || StringUtils.isNotBlank(empName)) {
+ empBaseInfo.setEmpName(empName);
+ }
+
+ String certificateNumb = getImportCellValue(list, 5);
try {
- if (StrUtil.isNotBlank(list.get(5).toString())) {
- empBaseInfo.setCertificateNumb(list.get(5).toString());
- if (IdcardUtil.isValidCard(list.get(5).toString())) {
- empBaseInfo.setAge(IdcardUtil.getAgeByIdCard(list.get(5).toString()));
- empBaseInfo.setBirthdate(IdcardUtil.getBirthDate(list.get(5).toString()));
+ if (isNew || StrUtil.isNotBlank(certificateNumb)) {
+ empBaseInfo.setCertificateNumb(certificateNumb);
+ if (IdcardUtil.isValidCard(certificateNumb)) {
+ empBaseInfo.setAge(IdcardUtil.getAgeByIdCard(certificateNumb));
+ empBaseInfo.setBirthdate(IdcardUtil.getBirthDate(certificateNumb));
}
}
-
} catch (Exception e) {
log.error("导入人员身份证异常：{}", e);
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", listObject.indexOf(list) + 1, list.get(5).toString()));
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", i + 1, certificateNumb));
continue;
}
-
- empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
-
- // 民族
- DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "nation") && StrUtil.equals(j.getDicItemName(), list.get(7).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setNation(dicItem.getDicItemCode());
+ String sex = getImportCellValue(list, 6);
+ if (isNew || StringUtils.isNotBlank(sex)) {
+ empBaseInfo.setSex("男".equals(sex) ? "1" : "2");
}
- // 婚姻状况
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "marriage") && StrUtil.equals(j.getDicItemName(), list.get(8).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setMarriage(dicItem.getDicItemCode());
- }
-
- if (StringUtils.isNotBlank(list.get(9).toString())) {
- empBaseInfo.setStature(Integer.valueOf(list.get(9).toString()));
- }
- // 政治面貌
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "plitical") && StrUtil.equals(j.getDicItemName(), list.get(10).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setPolitics(dicItem.getDicItemCode());
- }
-
- if (StringUtils.isNotBlank(list.get(11).toString())) {
- empBaseInfo.setEntryDate(DateUtil.parse(list.get(11).toString()));
- }
-
- // 最高学历
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "education") && StrUtil.equals(j.getDicItemName(), list.get(12).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setEducation(dicItem.getDicItemCode());
- }
-
- if (StringUtils.isNotBlank(list.get(13).toString())) {
- empBaseInfo.setSeniority(list.get(13).toString());
- }
-
- // 籍贯
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "nativePlace") && StrUtil.equals(j.getDicItemName(), list.get(14).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setNativePlace(dicItem.getDicItemCode());
- }
-
- empBaseInfo.setCensusAddress(list.get(15).toString());
- empBaseInfo.setCurrentAddress(list.get(16).toString());
- // 员工类型
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "empType") && StrUtil.equals(j.getDicItemName(), list.get(17).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setEmpType(dicItem.getDicItemCode());
- }
-
- empBaseInfo.setGuardNumb(list.get(18).toString());
- empBaseInfo.setReturnReceipt(list.get(19).toString());
- empBaseInfo.setTelePhone(list.get(20).toString());
- empBaseInfo.setIntroducer(list.get(21).toString());
- empBaseInfo.setBankName(list.get(22).toString());
- empBaseInfo.setBankNumb(list.get(23).toString());
- // 保险类型
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "insuranceType") && StrUtil.equals(j.getDicItemName(), list.get(24).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setInsuranceType(dicItem.getDicItemCode());
- }
-
- empBaseInfo.setSocialNumb(list.get(25).toString());
- empBaseInfo.setFamily(list.get(26).toString());
- empBaseInfo.setUrgencyPhone(list.get(27).toString());
- // 员工手册
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "handbookStatus") && StrUtil.equals(j.getDicItemName(), list.get(28).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setHandbookStatus(dicItem.getDicItemCode());
- }
-
- // 工作证
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "empCardStatus") && StrUtil.equals(j.getDicItemName(), list.get(29).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setEmpCardStatus(dicItem.getDicItemCode());
- }
-
- // 相关证件
- List<DicItem> dicItemList = new ArrayList<>();
- String[] certificateList = list.get(30).toString().split(StringConstant.COMMA);
- if (null != certificateList) {
- for (String s : certificateList) {
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "certificateList") && StrUtil.equals(j.getDicItemName(), s)).findFirst().orElse(null);
+ // 民族 - 使用字典Map查找
+ String nationName = getImportCellValue(list, 7);
+ if (StringUtils.isNotBlank(nationName)) {
+ Map<String, DicItem> nationDic = dicMap.get("nation");
+ if (nationDic != null) {
+ DicItem dicItem = nationDic.get(nationName);
if (null != dicItem) {
- dicItemList.add(dicItem);
+ empBaseInfo.setNation(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ // 婚姻状况 - 使用字典Map查找
+ String marriageName = getImportCellValue(list, 8);
+ if (StringUtils.isNotBlank(marriageName)) {
+ Map<String, DicItem> marriageDic = dicMap.get("marriage");
+ if (marriageDic != null) {
+ DicItem dicItem = marriageDic.get(marriageName);
+ if (null != dicItem) {
+ empBaseInfo.setMarriage(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String stature = getImportCellValue(list, 9);
+ if (StringUtils.isNotBlank(stature)) {
+ empBaseInfo.setStature(Integer.valueOf(stature));
+ }
+ // 政治面貌 - 使用字典Map查找
+ String politicsName = getImportCellValue(list, 10);
+ if (StringUtils.isNotBlank(politicsName)) {
+ Map<String, DicItem> politicsDic = dicMap.get("plitical");
+ if (politicsDic != null) {
+ DicItem dicItem = politicsDic.get(politicsName);
+ if (null != dicItem) {
+ empBaseInfo.setPolitics(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String entryDate = getImportCellValue(list, 11);
+ if (StringUtils.isNotBlank(entryDate)) {
+ empBaseInfo.setEntryDate(DateUtil.parse(entryDate));
+ }
+
+ // 最高学历 - 使用字典Map查找
+ String educationName = getImportCellValue(list, 12);
+ if (StringUtils.isNotBlank(educationName)) {
+ Map<String, DicItem> educationDic = dicMap.get("education");
+ if (educationDic != null) {
+ DicItem dicItem = educationDic.get(educationName);
+ if (null != dicItem) {
+ empBaseInfo.setEducation(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String seniority = getImportCellValue(list, 13);
+ if (StringUtils.isNotBlank(seniority)) {
+ empBaseInfo.setSeniority(seniority);
+ }
+
+ // 籍贯 - 使用字典Map查找
+ String nativePlaceName = getImportCellValue(list, 14);
+ if (StringUtils.isNotBlank(nativePlaceName)) {
+ Map<String, DicItem> nativePlaceDic = dicMap.get("nativePlace");
+ if (nativePlaceDic != null) {
+ DicItem dicItem = nativePlaceDic.get(nativePlaceName);
+ if (null != dicItem) {
+ empBaseInfo.setNativePlace(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String censusAddress = getImportCellValue(list, 15);
+ if (isNew || StringUtils.isNotBlank(censusAddress)) {
+ empBaseInfo.setCensusAddress(censusAddress);
+ }
+ String currentAddress = getImportCellValue(list, 16);
+ if (isNew || StringUtils.isNotBlank(currentAddress)) {
+ empBaseInfo.setCurrentAddress(currentAddress);
+ }
+ // 员工类型 - 使用字典Map查找
+ String empTypeName = getImportCellValue(list, 17);
+ if (StringUtils.isNotBlank(empTypeName)) {
+ Map<String, DicItem> empTypeDic = dicMap.get("empType");
+ if (empTypeDic != null) {
+ DicItem dicItem = empTypeDic.get(empTypeName);
+ if (null != dicItem) {
+ empBaseInfo.setEmpType(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String guardNumb = getImportCellValue(list, 18);
+ if (isNew || StringUtils.isNotBlank(guardNumb)) {
+ empBaseInfo.setGuardNumb(guardNumb);
+ }
+ String returnReceipt = getImportCellValue(list, 19);
+ if (isNew || StringUtils.isNotBlank(returnReceipt)) {
+ empBaseInfo.setReturnReceipt(returnReceipt);
+ }
+ String telePhone = getImportCellValue(list, 20);
+ if (isNew || StringUtils.isNotBlank(telePhone)) {
+ empBaseInfo.setTelePhone(telePhone);
+ }
+ String introducer = getImportCellValue(list, 21);
+ if (isNew || StringUtils.isNotBlank(introducer)) {
+ empBaseInfo.setIntroducer(introducer);
+ }
+ String bankName = getImportCellValue(list, 22);
+ if (isNew || StringUtils.isNotBlank(bankName)) {
+ empBaseInfo.setBankName(bankName);
+ }
+ String bankNumb = getImportCellValue(list, 23);
+ if (isNew || StringUtils.isNotBlank(bankNumb)) {
+ empBaseInfo.setBankNumb(bankNumb);
+ }
+ // 保险类型 - 使用字典Map查找
+ String insuranceTypeName = getImportCellValue(list, 24);
+ if (StringUtils.isNotBlank(insuranceTypeName)) {
+ Map<String, DicItem> insuranceTypeDic = dicMap.get("insuranceType");
+ if (insuranceTypeDic != null) {
+ DicItem dicItem = insuranceTypeDic.get(insuranceTypeName);
+ if (null != dicItem) {
+ empBaseInfo.setInsuranceType(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ String socialNumb = getImportCellValue(list, 25);
+ if (isNew || StringUtils.isNotBlank(socialNumb)) {
+ empBaseInfo.setSocialNumb(socialNumb);
+ }
+ String family = getImportCellValue(list, 26);
+ if (isNew || StringUtils.isNotBlank(family)) {
+ empBaseInfo.setFamily(family);
+ }
+ String urgencyPhone = getImportCellValue(list, 27);
+ if (isNew || StringUtils.isNotBlank(urgencyPhone)) {
+ empBaseInfo.setUrgencyPhone(urgencyPhone);
+ }
+ // 员工手册 - 使用字典Map查找
+ String handbookStatusName = getImportCellValue(list, 28);
+ if (StringUtils.isNotBlank(handbookStatusName)) {
+ Map<String, DicItem> handbookStatusDic = dicMap.get("handbookStatus");
+ if (handbookStatusDic != null) {
+ DicItem dicItem = handbookStatusDic.get(handbookStatusName);
+ if (null != dicItem) {
+ empBaseInfo.setHandbookStatus(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ // 工作证 - 使用字典Map查找
+ String empCardStatusName = getImportCellValue(list, 29);
+ if (StringUtils.isNotBlank(empCardStatusName)) {
+ Map<String, DicItem> empCardStatusDic = dicMap.get("empCardStatus");
+ if (empCardStatusDic != null) {
+ DicItem dicItem = empCardStatusDic.get(empCardStatusName);
+ if (null != dicItem) {
+ empBaseInfo.setEmpCardStatus(dicItem.getDicItemCode());
+ }
+ }
+ }
+
+ // 相关证件 - 使用字典Map查找
+ List<DicItem> dicItemList = new ArrayList<>();
+ String certificateListValue = getImportCellValue(list, 30);
+ String[] certificateList = certificateListValue.split(StringConstant.COMMA);
+ if (isNew || StringUtils.isNotBlank(certificateListValue)) {
+ Map<String, DicItem> certificateListDic = dicMap.get("certificateList");
+ for (String s : certificateList) {
+ if (certificateListDic != null) {
+ DicItem dicItem = certificateListDic.get(s);
+ if (null != dicItem) {
+ dicItemList.add(dicItem);
+ }
}
}
}
if (CollUtil.isNotEmpty(dicItemList)) {
- empBaseInfo.setCertificateList(dicItemList.stream().map(i -> i.getDicItemCode()).collect(Collectors.joining(StringConstant.COMMA)));
+ empBaseInfo.setCertificateList(dicItemList.stream()
+ .map(DicItem::getDicItemCode)
+ .collect(Collectors.joining(StringConstant.COMMA)));
}
- empBaseInfo.setDelFlag(2);
- // 入职类型
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "lztype") && StrUtil.equals(j.getDicItemName(), list.get(31).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setEntryType(dicItem.getDicItemCode());
+ if (isNew) {
+ empBaseInfo.setDelFlag(2);
}
- // 档案情况
- dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "archivesStatus") && StrUtil.equals(j.getDicItemName(), list.get(32).toString())).findFirst().orElse(null);
- if (null != dicItem) {
- empBaseInfo.setArchivesStatus(dicItem.getDicItemCode());
+ // 入职类型 - 使用字典Map查找
+ String lztypeName = getImportCellValue(list, 31);
+ if (StringUtils.isNotBlank(lztypeName)) {
+ Map<String, DicItem> lztypeDic = dicMap.get("lztype");
+ if (lztypeDic != null) {
+ DicItem dicItem = lztypeDic.get(lztypeName);
+ if (null != dicItem) {
+ empBaseInfo.setEntryType(dicItem.getDicItemCode());
+ }
+ }
+ }
+ // 档案情况 - 使用字典Map查找
+ String archivesStatusName = getImportCellValue(list, 32);
+ if (StringUtils.isNotBlank(archivesStatusName)) {
+ Map<String, DicItem> archivesStatusDic = dicMap.get("archivesStatus");
+ if (archivesStatusDic != null) {
+ DicItem dicItem = archivesStatusDic.get(archivesStatusName);
+ if (null != dicItem) {
+ empBaseInfo.setArchivesStatus(dicItem.getDicItemCode());
+ }
+ }
}
// 身份证有效期
- empBaseInfo.setCertificateValidity(DateUtil.parse(list.get(33).toString()));
- empBaseInfo.setEmpStatus("0");
- boolean saveResult = this.save(empBaseInfo);
- // 新入职员工需要增加一条入职记录
- this.addEmpDimissLog(empBaseInfo, "2", empBaseInfo.getEmpId());
+ String certificateValidity = getImportCellValue(list, 33);
+ if (isNew || StringUtils.isNotBlank(certificateValidity)) {
+ empBaseInfo.setCertificateValidity(DateUtil.parse(certificateValidity));
+ }
+ if (isNew) {
+ empBaseInfo.setEmpStatus("0");
+ newEmpList.add(empBaseInfo);
+ } else {
+ empBaseInfo.setModifyTime(new Date());
+ empBaseInfo.setModifier(operatorId);
+ updateEmpList.add(empBaseInfo);
+ }
}
+
+ // ========== 优化4：批量保存/更新 ==========
+ if (CollUtil.isNotEmpty(newEmpList)) {
+ this.saveBatch(newEmpList, 100);
+ // 批量添加入职记录
+ for (EmpBaseInfo emp : newEmpList) {
+ this.addEmpDimissLog(emp, "2", emp.getEmpId());
+ }
+ }
+
+ if (CollUtil.isNotEmpty(updateEmpList)) {
+ this.updateBatchById(updateEmpList, 100);
+ }
+ }
+
+ private String getImportCellValue(List<Object> list, int index) {
+ if (index >= list.size() || list.get(index) == null) {
+ return StringUtils.EMPTY;
+ }
+ return list.get(index).toString();
+ }
+
+ private List<Dept> getImportDepts(List<Dept> depts) {
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ return depts;
+ }
+
+ private List<Position> getImportPositions(List<Position> positionList) {
+ if (null == positionList) {
+ positionList = remotePositionService.setPositionRedis();
+ }
+ return positionList;
+ }
+
+ private DicItem getImportDicItem(List<DicItem> dicItems, String dicCode, String dicItemName) {
+ if (StrUtil.isBlank(dicItemName)) {
+ return null;
+ }
+ return dicItems.parallelStream()
+ .filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), dicCode) && StrUtil.equals(j.getDicItemName(), dicItemName))
+ .findFirst()
+ .orElse(null);
}
// @Override
--
Gitblit v1.8.0