From 4e55bd9cee8e44f7a7a0d9185d8323fc7be9193d Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 21:14:01 +0800
Subject: [PATCH] fix(hr): 修正员工基础信息字典字段的大小写问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 608 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 381 insertions(+), 227 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 7b3c90e..5168285 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
@@ -491,189 +491,370 @@
*
* @param listObject
*/
+ /**
+ * 导入员工基本信息
+ * 重构后认知复杂度: ~10 (原224)
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public void importEmpBaseInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
- for (List<Object> list : listObject) {
- if (list.size() == 0) {
+ ImportContext context = prepareImportContext(listObject, dicItems);
+ String operatorId = FebsUtil.getUserId();
+ List<EmpBaseInfo> newEmpList = new ArrayList<>();
+ List<EmpBaseInfo> updateEmpList = new ArrayList<>();
+
+ for (int i = 0; i < listObject.size(); i++) {
+ List<Object> rowData = listObject.get(i);
+ if (rowData.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(rowData, 1);
+ EmpBaseInfo dbData = context.empMap.get(empNumb);
+
+ EmpBaseInfo empBaseInfo = buildEmpBaseInfo(rowData, i, dbData, context.dicMap,
+ context.deptMap, context.positionMap, context.certCountMap, returnList, operatorId);
+
+ if (empBaseInfo == null) {
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;
+
+ if (dbData == null) {
+ newEmpList.add(empBaseInfo);
+ } else {
+ updateEmpList.add(empBaseInfo);
}
- EmpBaseInfo empBaseInfo = new EmpBaseInfo();
+ }
+
+ batchSaveEmployees(newEmpList, updateEmpList, operatorId);
+ }
+
+ /**
+ * 准备导入上下文数据
+ */
+ private ImportContext prepareImportContext(List<List<Object>> listObject, List<DicItem> dicItems) {
+ ImportContext context = new ImportContext();
+
+ // 收集员工编号
+ Set<String> empNumbs = listObject.stream()
+ .filter(list -> !list.isEmpty())
+ .map(list -> getImportCellValue(list, 1))
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.toSet());
+
+ // 批量查询已存在的员工
+ context.empMap = CollUtil.isEmpty(empNumbs) ? new HashMap<>() :
+ this.list(new LambdaQueryWrapper<EmpBaseInfo>().in(EmpBaseInfo::getEmpNumb, empNumbs))
+ .stream()
+ .collect(Collectors.toMap(EmpBaseInfo::getEmpNumb, e -> e));
+
+ // 批量查询身份证号重复情况
+ context.certCountMap = CollUtil.isEmpty(empNumbs) ? new HashMap<>() :
+ this.list(new LambdaQueryWrapper<EmpBaseInfo>()
+ .select(EmpBaseInfo::getCertificateNumb)
+ .in(EmpBaseInfo::getCertificateNumb, empNumbs)
+ .ne(EmpBaseInfo::getDelFlag, 1))
+ .stream()
+ .filter(e -> StringUtils.isNotBlank(e.getCertificateNumb()))
+ .collect(Collectors.groupingBy(EmpBaseInfo::getCertificateNumb, Collectors.counting()));
+
+ // 部门Map
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (CollUtil.isEmpty(depts)) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ context.deptMap = CollUtil.isEmpty(depts) ? new HashMap<>() :
+ depts.stream().collect(Collectors.toMap(Dept::getDeptName, d -> d, (v1, v2) -> v1));
+
+ // 岗位Map
+ List<Position> positionList = CastUtil.castList(redisService.get("position"), Position.class);
+ if (CollUtil.isEmpty(positionList)) {
+ positionList = remotePositionService.setPositionRedis();
+ }
+ context.positionMap = CollUtil.isEmpty(positionList) ? new HashMap<>() :
+ positionList.stream().collect(Collectors.toMap(Position::getPositionName, p -> p, (v1, v2) -> v1));
+
+ // 字典Map
+ context.dicMap = CollUtil.isEmpty(dicItems) ? new HashMap<>() :
+ dicItems.stream().collect(Collectors.groupingBy(
+ DicItem::getDicCode,
+ Collectors.toMap(DicItem::getDicItemName, d -> d, (v1, v2) -> v1)));
+
+ return context;
+ }
+
+ /**
+ * 批量保存员工数据
+ */
+ private void batchSaveEmployees(List<EmpBaseInfo> newEmpList, List<EmpBaseInfo> updateEmpList, String operatorId) {
+ if (CollUtil.isNotEmpty(newEmpList)) {
+ this.saveBatch(newEmpList, 100);
+ newEmpList.forEach(emp -> this.addEmpDimissLog(emp, "2", emp.getEmpId()));
+ }
+ if (CollUtil.isNotEmpty(updateEmpList)) {
+ this.updateBatchById(updateEmpList, 100);
+ }
+ }
+
+ /**
+ * 从字典Map中获取字典项Code并设置到员工对象
+ * 降低认知复杂度：将重复的字典查找逻辑提取为通用方法
+ */
+ private void setDicFieldFromMap(EmpBaseInfo empBaseInfo, Map<String, Map<String, DicItem>> dicMap,
+ String dicCode, String dicItemName, java.util.function.Consumer<String> setter) {
+ if (StringUtils.isBlank(dicItemName)) {
+ return;
+ }
+ Map<String, DicItem> subDicMap = dicMap.get(dicCode);
+ if (subDicMap == null) {
+ return;
+ }
+ DicItem dicItem = subDicMap.get(dicItemName);
+ if (dicItem != null) {
+ setter.accept(dicItem.getDicItemCode());
+ }
+ }
+
+ 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);
+ }
+
+ // ==================== importEmpBaseInfo 重构辅助方法 ====================
+
+ /**
+ * 条件设置字符串字段（isNew 或值非空时设置）
+ */
+ private void setIfNewOrNotBlank(EmpBaseInfo empBaseInfo, boolean isNew, String value,
+ java.util.function.Consumer<String> setter) {
+ if (isNew || StringUtils.isNotBlank(value)) {
+ setter.accept(value);
+ }
+ }
+
+ /**
+ * 处理身份证信息并设置相关字段
+ */
+ private void processCertificateNumb(EmpBaseInfo empBaseInfo, String certificateNumb) {
+ if (StringUtils.isBlank(certificateNumb)) {
+ return;
+ }
+ empBaseInfo.setCertificateNumb(certificateNumb);
+ if (IdcardUtil.isValidCard(certificateNumb)) {
+ empBaseInfo.setAge(IdcardUtil.getAgeByIdCard(certificateNumb));
+ empBaseInfo.setBirthdate(IdcardUtil.getBirthDate(certificateNumb));
+ }
+ }
+
+ /**
+ * 处理证件列表字段
+ */
+ private void processCertificateList(EmpBaseInfo empBaseInfo, Map<String, Map<String, DicItem>> dicMap,
+ String certificateListValue) {
+ if (StringUtils.isBlank(certificateListValue)) {
+ return;
+ }
+ Map<String, DicItem> certListDic = dicMap.get("certificateList");
+ if (certListDic == null) {
+ return;
+ }
+ String[] items = certificateListValue.split(StringConstant.COMMA);
+ String codes = Arrays.stream(items)
+ .map(certListDic::get)
+ .filter(Objects::nonNull)
+ .map(DicItem::getDicItemCode)
+ .collect(Collectors.joining(StringConstant.COMMA));
+ if (StringUtils.isNotBlank(codes)) {
+ empBaseInfo.setCertificateList(codes);
+ }
+ }
+
+ /**
+ * 构建员工基本信息对象
+ *
+ * @return 构建结果，null表示构建失败需要跳过
+ */
+ private EmpBaseInfo buildEmpBaseInfo(List<Object> rowData, int rowIndex, EmpBaseInfo dbData,
+ Map<String, Map<String, DicItem>> dicMap,
+ Map<String, Dept> deptMap, Map<String, Position> positionMap,
+ Map<String, Long> certCountMap, List<String> returnList,
+ String operatorId) {
+ String empNumb = getImportCellValue(rowData, 1);
+ boolean isNew = dbData == null;
+
+ // 检查身份证号重复
+ if (isNew && certCountMap.getOrDefault(empNumb, 0L) > 0) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}身份证号重复", rowIndex + 1, empNumb));
+ return null;
+ }
+
+ EmpBaseInfo empBaseInfo = isNew ? new EmpBaseInfo() : dbData;
+ if (isNew) {
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empBaseInfo.setArchivesNumb(list.get(0).toString());
- empBaseInfo.setEmpNumb(list.get(1).toString());
+ empBaseInfo.setDelFlag(2);
+ empBaseInfo.setEmpStatus("0");
+ }
- 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;
- }
+ // 设置基础字段
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 0), empBaseInfo::setArchivesNumb);
+ setIfNewOrNotBlank(empBaseInfo, isNew, empNumb, empBaseInfo::setEmpNumb);
+ // 设置部门信息
+ String deptName = getImportCellValue(rowData, 2);
+ if (isNew || StringUtils.isNotBlank(deptName)) {
+ Dept dept = deptMap.get(deptName);
+ if (dept == null) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在", rowIndex + 1, deptName));
+ return null;
+ }
+ empBaseInfo.setDeptName(deptName);
empBaseInfo.setAllDeptName(dept.getAllDeptName());
-
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()));
- continue;
- }
- }
- 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(rowData, 3);
+ if (isNew || StringUtils.isNotBlank(jobName)) {
+ Position position = positionMap.get(jobName);
+ if (position == null) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}获取岗位为空", rowIndex + 1, jobName));
+ return null;
}
empBaseInfo.setJobId(position.getPositionId());
- empBaseInfo.setJobName(list.get(3).toString());
- empBaseInfo.setEmpName(list.get(4).toString());
- 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()));
- }
- }
+ empBaseInfo.setJobName(jobName);
+ }
+ // 设置姓名
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 4), empBaseInfo::setEmpName);
+
+ // 处理身份证
+ String certificateNumb = getImportCellValue(rowData, 5);
+ if (isNew || StrUtil.isNotBlank(certificateNumb)) {
+ try {
+ processCertificateNumb(empBaseInfo, certificateNumb);
} catch (Exception e) {
log.error("导入人员身份证异常：{}", e);
- returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", listObject.indexOf(list) + 1, list.get(5).toString()));
- continue;
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}检查身份证是否正确", rowIndex + 1, certificateNumb));
+ return null;
}
-
-
- 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());
- }
-
- // 婚姻状况
- 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);
- if (null != dicItem) {
- dicItemList.add(dicItem);
- }
- }
- }
-
- if (CollUtil.isNotEmpty(dicItemList)) {
- empBaseInfo.setCertificateList(dicItemList.stream().map(i -> i.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());
- }
- // 档案情况
- 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());
- }
- //身份证有效期
- empBaseInfo.setCertificateValidity(DateUtil.parse(list.get(33).toString()));
- empBaseInfo.setEmpStatus("0");
- boolean saveResult = this.save(empBaseInfo);
- // 新入职员工需要增加一条入职记录
- this.addEmpDimissLog(empBaseInfo, "2", empBaseInfo.getEmpId());
}
+
+ // 设置性别
+ String sex = getImportCellValue(rowData, 6);
+ if (isNew || StringUtils.isNotBlank(sex)) {
+ empBaseInfo.setSex("男".equals(sex) ? "1" : "2");
+ }
+
+ // 设置字典类字段
+ setDicFieldFromMap(empBaseInfo, dicMap, "NATION", getImportCellValue(rowData, 7), empBaseInfo::setNation);
+ setDicFieldFromMap(empBaseInfo, dicMap, "MARRIAGE", getImportCellValue(rowData, 8), empBaseInfo::setMarriage);
+
+ // 身高
+ String stature = getImportCellValue(rowData, 9);
+ if (StringUtils.isNotBlank(stature)) {
+ empBaseInfo.setStature(Integer.valueOf(stature));
+ }
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "PLITICAL", getImportCellValue(rowData, 10), empBaseInfo::setPolitics);
+
+ // 入职日期
+ String entryDate = getImportCellValue(rowData, 11);
+ if (StringUtils.isNotBlank(entryDate)) {
+ empBaseInfo.setEntryDate(DateUtil.parse(entryDate));
+ }
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "EDUCATION", getImportCellValue(rowData, 12), empBaseInfo::setEducation);
+
+ // 工龄
+ String seniority = getImportCellValue(rowData, 13);
+ if (StringUtils.isNotBlank(seniority)) {
+ empBaseInfo.setSeniority(seniority);
+ }
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "NATIVEPLACE", getImportCellValue(rowData, 14), empBaseInfo::setNativePlace);
+
+ // 地址信息
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 15), empBaseInfo::setCensusAddress);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 16), empBaseInfo::setCurrentAddress);
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "EMPTYPE", getImportCellValue(rowData, 17), empBaseInfo::setEmpType);
+
+ // 其他字段
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 18), empBaseInfo::setGuardNumb);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 19), empBaseInfo::setReturnReceipt);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 20), empBaseInfo::setTelePhone);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 21), empBaseInfo::setIntroducer);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 22), empBaseInfo::setBankName);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 23), empBaseInfo::setBankNumb);
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "INSURANCETYPE", getImportCellValue(rowData, 24), empBaseInfo::setInsuranceType);
+
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 25), empBaseInfo::setSocialNumb);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 26), empBaseInfo::setFamily);
+ setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 27), empBaseInfo::setUrgencyPhone);
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "handbookStatus", getImportCellValue(rowData, 28), empBaseInfo::setHandbookStatus);
+ setDicFieldFromMap(empBaseInfo, dicMap, "empCardStatus", getImportCellValue(rowData, 29), empBaseInfo::setEmpCardStatus);
+
+ // 证件列表
+ processCertificateList(empBaseInfo, dicMap, getImportCellValue(rowData, 30));
+
+ setDicFieldFromMap(empBaseInfo, dicMap, "LZTYPE", getImportCellValue(rowData, 31), empBaseInfo::setEntryType);
+ setDicFieldFromMap(empBaseInfo, dicMap, "archivesStatus", getImportCellValue(rowData, 32), empBaseInfo::setArchivesStatus);
+
+ // 身份证有效期
+ String certificateValidity = getImportCellValue(rowData, 33);
+ if (isNew || StringUtils.isNotBlank(certificateValidity)) {
+ empBaseInfo.setCertificateValidity(DateUtil.parse(certificateValidity));
+ }
+
+ // 设置修改信息
+ if (!isNew) {
+ empBaseInfo.setModifyTime(new Date());
+ empBaseInfo.setModifier(operatorId);
+ }
+
+ return empBaseInfo;
+ }
+
+ /**
+ * 导入上下文数据结构
+ */
+ private static class ImportContext {
+ Map<String, EmpBaseInfo> empMap = new HashMap<>();
+ Map<String, Long> certCountMap = new HashMap<>();
+ Map<String, Dept> deptMap = new HashMap<>();
+ Map<String, Position> positionMap = new HashMap<>();
+ Map<String, Map<String, DicItem>> dicMap = new HashMap<>();
}
// @Override
@@ -1079,7 +1260,7 @@
if (count != null) {
stringObjectMap.put("insuranceCount", count);
}
- //QueryRequest request
+ // QueryRequest request
return stringObjectMap;
}
@@ -1488,7 +1669,7 @@
@Override
public void updateAnnualLeave(String userId) {
EmpBaseInfo empBaseInfo = this.getById(userId);
- int holiday = calculateHoliday(empBaseInfo.getEntryDate());
+ int holiday = calculateHoliday(empBaseInfo.getEntryDate(), empBaseInfo.getEmpStatus());
empBaseInfo.setAnnualLeave(holiday);
baseMapper.update(null, new LambdaUpdateWrapper<EmpBaseInfo>()
.set(EmpBaseInfo::getAnnualLeave, holiday)
@@ -1499,7 +1680,7 @@
public void updateAnnualLeave() {
List<EmpBaseInfo> list = this.list();
list.parallelStream().forEach(p -> {
- int holiday = calculateHoliday(p.getEntryDate());
+ int holiday = calculateHoliday(p.getEntryDate(), p.getEmpStatus());
p.setAnnualLeave(holiday);
baseMapper.update(null, new LambdaUpdateWrapper<EmpBaseInfo>()
.set(EmpBaseInfo::getAnnualLeave, holiday)
@@ -1511,7 +1692,7 @@
public void updateEmpBaseKeyInfo() {
List<EmpBaseInfo> list = this.list();
list.parallelStream().forEach(p -> {
- int holiday = calculateHoliday(p.getEntryDate());
+ int holiday = calculateHoliday(p.getEntryDate(), p.getEmpStatus());
int age = calculateAge(p.getBirthdate());
baseMapper.update(null, new LambdaUpdateWrapper<EmpBaseInfo>()
@@ -1528,7 +1709,7 @@
SortUtil.handlePageSort(request, page, "insuranceType", FebsConstant.ORDER_DESC, true);
// 使用优化后的方法查询社保档位提醒员工
- List<EmpBaseInfo> alertList = findInsuranceAlertList(empBaseInfo,request);
+ List<EmpBaseInfo> alertList = findInsuranceAlertList(empBaseInfo, request);
// 手动分页
int total = alertList.size();
int start = (int) ((page.getCurrent() - 1) * page.getSize());
@@ -1572,8 +1753,9 @@
@Override
public Long countInsuranceAlert(EmpBaseInfo empBaseInfo, QueryRequest request) {
- return (long) findInsuranceAlertList(empBaseInfo,request).size();
+ return (long) findInsuranceAlertList(empBaseInfo, request).size();
}
+
/**
* 查询社保档位提醒员工列表
* 保险类型：6-(非深户) 四险二档 7-(非深户) 四险一档 10-外参 13-临时工意外险 14-甲方购买
@@ -1585,7 +1767,6 @@
private List<EmpBaseInfo> findInsuranceAlertList(EmpBaseInfo empBaseInfo, QueryRequest request) {
// 1. 计算时间范围
LocalDate[] dateRange = calculateDateRange(empBaseInfo.getTimeRange());
- LocalDate startDate = dateRange[0];
LocalDate endDate = dateRange[1];
// 2. 获取提醒年龄配置
@@ -1624,12 +1805,14 @@
}
int alertAge = "1".equals(emp.getSex()) ? alertManAge : alertWomanAge;
+ int maxAge = "1".equals(emp.getSex()) ? 50 : 40;
LocalDate birthDate = emp.getBirthdate().toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate();
LocalDate alertDate = birthDate.plusYears(alertAge);
+ LocalDate maxDate = birthDate.plusYears(maxAge);
- return !alertDate.isAfter(endDate);
+ return !alertDate.isAfter(endDate) && endDate.isBefore(maxDate);
})
.collect(Collectors.toList());
}
@@ -1642,14 +1825,14 @@
// 使用正向计算获取退休提醒列表
List<EmpBaseInfo> alertList = findRetirementAlertList(empBaseInfo);
-
+
// 手动分页
int total = alertList.size();
int start = (int) ((page.getCurrent() - 1) * page.getSize());
int end = Math.min(start + (int) page.getSize(), total);
-
+
List<EmpBaseInfo> pageList = start < total ? alertList.subList(start, end) : new ArrayList<>();
-
+
// 设置字典名称
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
pageList.forEach(item -> {
@@ -1659,7 +1842,7 @@
.map(DicItem::getDicItemName)
.orElse("未知"));
});
-
+
// 构建分页结果
Page<EmpBaseInfo> resultPage = new Page<>(page.getCurrent(), page.getSize(), total);
resultPage.setRecords(pageList);
@@ -1720,58 +1903,35 @@
/**
* 根据设置的参数计算员工的年假
*
- * @param date 入职日期
+ * @param date 入职日期
+ * @param empStatus 人员状态（0-正常 1-离职 2-退休）只计算在职的
* @return 年假天数
*/
- private int calculateHoliday(Date date) {
- int holiday = 0;
- int joinYear = DateUtil.ageOfNow(date);
- String configValue = redisService.get("annual_leave").toString();
- String[] values = StrUtil.split(configValue, "|");
- String[] condition = StrUtil.split(values[0], ",");
- String[] days = StrUtil.split(values[1], ",");
- if (condition.length == 2) {
- int one = Integer.parseInt(condition[0]);
- int two = Integer.parseInt(condition[1]);
- if (joinYear >= one && joinYear < two) {
- holiday = Integer.parseInt(days[0]);
- } else if (joinYear >= two) {
- holiday = Integer.parseInt(days[1]);
+ private int calculateHoliday(Date date, String empStatus) {
+ if (!empStatus.equals("0")) {
+ int holiday = 0;
+ int joinYear = DateUtil.ageOfNow(date);
+ String configValue = redisService.get("annual_leave").toString();
+ String[] values = StrUtil.split(configValue, "|");
+ String[] condition = StrUtil.split(values[0], ",");
+ String[] days = StrUtil.split(values[1], ",");
+ if (condition.length == 2) {
+ int one = Integer.parseInt(condition[0]);
+ int two = Integer.parseInt(condition[1]);
+ if (joinYear >= one && joinYear < two) {
+ holiday = Integer.parseInt(days[0]);
+ } else if (joinYear >= two) {
+ holiday = Integer.parseInt(days[1]);
+ }
}
+ return holiday;
+ } else {
+ return 0;
}
- return holiday;
}
private int calculateAge(Date date) {
return DateUtil.ageOfNow(date);
- }
-
- private QueryWrapper<EmpBaseInfo> createInsuranceAlertQueryWrapper(EmpBaseInfo empBaseInfo) {
- String[] alertInsuranceTypes = {"6", "7", "10", "13", "14"};
-
- QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("a.DelFlag", "0");
- queryWrapper.eq("a.empStatus", "0");
- queryWrapper.in("a.insuranceType", (Object[]) alertInsuranceTypes);
-
- int alertWomanAge = getRedisConfigWithDefault("insurance_alert_woman", 39);
- int alertManAge = getRedisConfigWithDefault("insurance_alert_man", 48);
-
- queryWrapper.and(wrapper ->
- wrapper.and(inner -> inner.eq("a.sex", "1").ge("a.age", alertManAge))
- .or(inner -> inner.eq("a.sex", "2").ge("a.age", alertWomanAge))
- );
-
-
- return queryWrapper;
- }
-
- private void buildAgeCondition(QueryWrapper<EmpBaseInfo> wrapper, int manAge, int womanAge) {
- wrapper.nested(inner -> inner
- .gt("a.age", manAge).eq("a.sex", "1")
- ).or().nested(inner -> inner
- .gt("a.age", womanAge).eq("a.sex", "2")
- );
}
private int getRedisConfigWithDefault(String key, int defaultValue) {
@@ -1829,13 +1989,6 @@
}
/**
- * 统计退休提醒数量（正向计算）
- */
- public Long countRetirementAlert(EmpBaseInfo empBaseInfo) {
- return (long) findRetirementAlertList(empBaseInfo).size();
- }
-
- /**
* 计算员工的实际退休时间（正向计算）
* 方案A：法定退休时间早于2025-01时，按法定年龄退休，不延迟
*/
@@ -1864,13 +2017,14 @@
// 法定退休时间晚于等于2025-01，计算延迟
long monthsBetween = ChronoUnit.MONTHS.between(delayStart, legalRetirement);
- long delayMonths = monthsBetween / delayDivisor;
+ long delayMonths = (monthsBetween / delayDivisor) + 1;
return legalRetirement.plusMonths(delayMonths);
}
/**
* 根据时间范围类型计算开始和结束日期
+ *
* @param timeRange 0-当天 1-本周 2-本月 3-今年
* @return 包含开始日期和结束日期的数组 [startDate, endDate)
*/
--
Gitblit v1.8.0