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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 d3fa5c8..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
@@ -775,8 +775,8 @@
}
// 设置字典类字段
- setDicFieldFromMap(empBaseInfo, dicMap, "nation", getImportCellValue(rowData, 7), empBaseInfo::setNation);
- setDicFieldFromMap(empBaseInfo, dicMap, "marriage", getImportCellValue(rowData, 8), empBaseInfo::setMarriage);
+ setDicFieldFromMap(empBaseInfo, dicMap, "NATION", getImportCellValue(rowData, 7), empBaseInfo::setNation);
+ setDicFieldFromMap(empBaseInfo, dicMap, "MARRIAGE", getImportCellValue(rowData, 8), empBaseInfo::setMarriage);
// 身高
String stature = getImportCellValue(rowData, 9);
@@ -784,7 +784,7 @@
empBaseInfo.setStature(Integer.valueOf(stature));
}
- setDicFieldFromMap(empBaseInfo, dicMap, "plitical", getImportCellValue(rowData, 10), empBaseInfo::setPolitics);
+ setDicFieldFromMap(empBaseInfo, dicMap, "PLITICAL", getImportCellValue(rowData, 10), empBaseInfo::setPolitics);
// 入职日期
String entryDate = getImportCellValue(rowData, 11);
@@ -792,7 +792,7 @@
empBaseInfo.setEntryDate(DateUtil.parse(entryDate));
}
- setDicFieldFromMap(empBaseInfo, dicMap, "education", getImportCellValue(rowData, 12), empBaseInfo::setEducation);
+ setDicFieldFromMap(empBaseInfo, dicMap, "EDUCATION", getImportCellValue(rowData, 12), empBaseInfo::setEducation);
// 工龄
String seniority = getImportCellValue(rowData, 13);
@@ -800,13 +800,13 @@
empBaseInfo.setSeniority(seniority);
}
- setDicFieldFromMap(empBaseInfo, dicMap, "nativePlace", getImportCellValue(rowData, 14), empBaseInfo::setNativePlace);
+ 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);
+ setDicFieldFromMap(empBaseInfo, dicMap, "EMPTYPE", getImportCellValue(rowData, 17), empBaseInfo::setEmpType);
// 其他字段
setIfNewOrNotBlank(empBaseInfo, isNew, getImportCellValue(rowData, 18), empBaseInfo::setGuardNumb);
@@ -816,7 +816,7 @@
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);
+ 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);
@@ -828,7 +828,7 @@
// 证件列表
processCertificateList(empBaseInfo, dicMap, getImportCellValue(rowData, 30));
- setDicFieldFromMap(empBaseInfo, dicMap, "lztype", getImportCellValue(rowData, 31), empBaseInfo::setEntryType);
+ setDicFieldFromMap(empBaseInfo, dicMap, "LZTYPE", getImportCellValue(rowData, 31), empBaseInfo::setEntryType);
setDicFieldFromMap(empBaseInfo, dicMap, "archivesStatus", getImportCellValue(rowData, 32), empBaseInfo::setArchivesStatus);
// 身份证有效期
--
Gitblit v1.8.0