From ffec90c897e9bd78e88b9fa590a5dd75d26b82c8 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 11:38:23 +0800
Subject: [PATCH] fix(hrm): 修复员工导入失败(日期格式 + 部门/岗位/角色不存在)
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java | 30 +++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java | 5
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 32 ++++++--
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java | 25 ++++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java | 10 ++
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/FlexibleLocalDateConverter.java | 113 ++++++++++++++++++++++++++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java | 12 +++
7 files changed, 217 insertions(+), 10 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/FlexibleLocalDateConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/FlexibleLocalDateConverter.java
new file mode 100644
index 0000000..e475223
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/FlexibleLocalDateConverter.java
@@ -0,0 +1,113 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 瀹芥澗鐨� LocalDate 杞崲鍣�
+ *
+ * <p>FastExcel 鍐呯疆鐨� {@code LocalDateStringConverter} 鍙 {@code yyyy-MM-dd}锛�
+ * 鑰屽鎴峰疄闄呯淮鎶ょ殑琛ㄦ牸閲屽緢甯歌 {@code 2026.3.30}銆亄@code 2026/3/30}銆亄@code 2026骞�3鏈�30鏃 杩欑被鍐欐硶锛�
+ * 涓�鏃﹁В鏋愪笉浜嗕細鎶� {@code ExcelDataConvertException}锛屽鑷存暣涓鍏ョ洿鎺ュけ璐ワ紙500锛夛紝
+ * 涓�鏉℃暟鎹兘杩涗笉鍘汇�傝繖閲屽仛澶氭牸寮忓吋瀹癸紝瑙f瀽涓嶄簡鏃剁疆绌猴紝浜ょ粰涓氬姟渚ф寜銆屽繀濉�嶈鍒欓�愭潯鎻愮ず銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Slf4j
+public class FlexibleLocalDateConverter implements Converter<LocalDate> {
+
+ /**
+ * Excel 鏃ユ湡搴忓垪鍙风殑鍩哄噯鏃ワ紙1899-12-30锛屽吋瀹� Excel 鐨� 1900 闂板勾 bug锛�
+ */
+ private static final LocalDate EXCEL_EPOCH = LocalDate.of(1899, 12, 30);
+
+ /**
+ * 绾棩鏈熸牸寮忥紝鎸夐『搴忓皾璇�
+ */
+ private static final List<DateTimeFormatter> DATE_FORMATTERS = Arrays.asList(
+ DateTimeFormatter.ofPattern("yyyy-M-d"),
+ DateTimeFormatter.ofPattern("yyyy.M.d"),
+ DateTimeFormatter.ofPattern("yyyy/M/d"),
+ DateTimeFormatter.ofPattern("yyyy骞碝鏈坉鏃�"),
+ DateTimeFormatter.ofPattern("yyyyMMdd")
+ );
+
+ /**
+ * 甯︽椂闂寸殑鏍煎紡锛屾寜椤哄簭灏濊瘯鍚庡彇鏃ユ湡閮ㄥ垎
+ */
+ private static final List<DateTimeFormatter> DATETIME_FORMATTERS = Arrays.asList(
+ DateTimeFormatter.ofPattern("yyyy-M-d H:m:s"),
+ DateTimeFormatter.ofPattern("yyyy-M-d H:m"),
+ DateTimeFormatter.ofPattern("yyyy.M.d H:m:s"),
+ DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"),
+ DateTimeFormatter.ofPattern("yyyy/M/d H:m")
+ );
+
+ @Override
+ public Class<LocalDate> supportJavaTypeKey() {
+ return LocalDate.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ // 涓嶉檺瀹氬崟鍏冩牸绫诲瀷锛氭枃鏈拰鏁板瓧閮借鏀寔
+ return null;
+ }
+
+ @Override
+ public LocalDate convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ if (cellData == null) {
+ return null;
+ }
+ // 1. 鏁板瓧锛氭寜 Excel 鏃ユ湡搴忓垪鍙疯В鏋�
+ if (CellDataTypeEnum.NUMBER.equals(cellData.getType())) {
+ BigDecimal numberValue = cellData.getNumberValue();
+ return numberValue == null ? null : EXCEL_EPOCH.plusDays(numberValue.longValue());
+ }
+ // 2. 鏂囨湰锛氬鏍煎紡渚濇灏濊瘯
+ String text = cellData.getStringValue();
+ if (text == null || text.trim().isEmpty()) {
+ return null;
+ }
+ text = text.trim();
+ for (DateTimeFormatter formatter : DATE_FORMATTERS) {
+ try {
+ return LocalDate.parse(text, formatter);
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ for (DateTimeFormatter formatter : DATETIME_FORMATTERS) {
+ try {
+ return LocalDateTime.parse(text, formatter).toLocalDate();
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ log.warn("[convertToJavaData][鏃ユ湡({}) 鏃犳硶璇嗗埆锛屽凡缃┖]", text);
+ return null;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalDate value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ if (value == null) {
+ return new WriteCellData<>("");
+ }
+ return new WriteCellData<>(value.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
index 977f0c1..6b1dcc5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
@@ -3,6 +3,7 @@
import cn.idev.excel.annotation.ExcelProperty;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.framework.excel.core.convert.FlexibleLocalDateConverter;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -38,7 +39,7 @@
@ExcelProperty("鐢ㄦ埛瑙掕壊")
private String roleNames;
- @ExcelProperty("鍏ヨ亴鏃ユ湡")
+ @ExcelProperty(value = "鍏ヨ亴鏃ユ湡", converter = FlexibleLocalDateConverter.class)
private LocalDate hireDate;
@ExcelProperty(value = "鍛樺伐鐘舵��", converter = DictConvert.class)
@@ -48,7 +49,7 @@
@ExcelProperty("韬唤璇佸彿")
private String idCard;
- @ExcelProperty("鍑虹敓鏃ユ湡")
+ @ExcelProperty(value = "鍑虹敓鏃ユ湡", converter = FlexibleLocalDateConverter.class)
private LocalDate birthday;
@ExcelProperty("姘戞棌")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index eefe7a7..157ad60 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -62,6 +63,7 @@
*/
@Service
@Validated
+@Slf4j
public class HrmEmployeeServiceImpl implements HrmEmployeeService {
@Resource
@@ -470,11 +472,18 @@
if (StrUtil.isBlank(deptName)) {
throw exception(EMPLOYEE_IMPORT_FIELD_REQUIRED, "閮ㄩ棬鍚嶇О");
}
- DeptRespDTO dept = deptMap.get(deptName.trim());
- if (dept == null) {
- throw exception(EMPLOYEE_DEPT_NAME_NOT_EXISTS, deptName.trim());
+ String trimmed = deptName.trim();
+ DeptRespDTO dept = deptMap.get(trimmed);
+ if (dept != null) {
+ return dept.getId();
}
- return dept.getId();
+ // 瀹㈡埛琛ㄦ牸閲岀殑閮ㄩ棬鍚嶅彲鑳藉皻鏈湪绯荤粺涓缓绔嬶紙濡傘�岀患鍚堣溅闂淬�嶏級锛�
+ // 閮ㄩ棬鏄憳宸ョ殑蹇呭~椤癸紝鐩存帴鎶ラ敊浼氳鏁存壒瀵煎叆鍏ㄩ儴澶辫触锛岃繖閲岃嚜鍔ㄨˉ寤哄埌鏍归儴闂ㄤ笅
+ Long deptId = deptApi.getOrCreateDeptByName(trimmed);
+ if (deptId == null) {
+ throw exception(EMPLOYEE_DEPT_NAME_NOT_EXISTS, trimmed);
+ }
+ return deptId;
}
private Set<Long> parsePostIds(String postNames, Map<String, PostRespDTO> postMap) {
@@ -488,10 +497,15 @@
continue;
}
PostRespDTO post = postMap.get(trimmed);
- if (post == null) {
- throw exception(EMPLOYEE_POST_NAME_NOT_EXISTS, trimmed);
+ if (post != null) {
+ postIds.add(post.getId());
+ continue;
}
- postIds.add(post.getId());
+ // 宀椾綅鏈缓绔嬫椂鑷姩琛ュ缓锛岄伩鍏嶆暣鎵瑰鍏ュけ璐�
+ Long postId = postApi.getOrCreatePostByName(trimmed);
+ if (postId != null) {
+ postIds.add(postId);
+ }
}
if (CollUtil.isEmpty(postIds)) {
throw exception(EMPLOYEE_IMPORT_FIELD_REQUIRED, "宀椾綅鍚嶇О");
@@ -511,7 +525,9 @@
}
RoleRespDTO role = roleMap.get(trimmed);
if (role == null) {
- throw exception(EMPLOYEE_ROLE_NAME_NOT_EXISTS, trimmed);
+ // 瑙掕壊瀵瑰憳宸ュ鍏ユ槸鍙�夐」锛岃〃鏍奸噷濉簡绯荤粺娌℃湁鐨勮鑹插悕锛堝父瑙佹槸鎶婇儴闂ㄥ悕璇~鍒拌鑹插垪锛夋椂璺宠繃锛屼笉闃诲瀵煎叆
+ log.warn("[parseRoleIds][瑙掕壊({}) 涓嶅瓨鍦紝宸茶烦杩嘳", trimmed);
+ continue;
}
roleIds.add(role.getId());
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
index 6deb38a..4da5f70 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
@@ -65,4 +65,16 @@
*/
List<DeptRespDTO> getChildDeptList(Long id);
+ /**
+ * 鎸夊悕绉拌幏寰楅儴闂ㄧ紪鍙凤紝涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓锛堟寕鍦ㄦ牴閮ㄩ棬涓嬶級
+ *
+ * <p>鐢ㄤ簬 Excel 瀵煎叆绛夈�屽彧鏈夊悕绉版病鏈夌紪鍙枫�嶇殑鍦烘櫙锛氬憳宸ュ鍏ユ椂閮ㄩ棬鏄繀濉」锛�
+ * 鑻ュ鎴疯〃鏍奸噷鐨勯儴闂ㄥ悕鍦ㄧ郴缁熶腑灏氭湭寤虹珛锛岀洿鎺ユ姤閿欎細瀵艰嚧鏁存壒瀵煎叆澶辫触锛�
+ * 杩欓噷鏀逛负鑷姩琛ュ缓锛屼繚璇佸鍏ュ彲鐢ㄣ��
+ *
+ * @param name 閮ㄩ棬鍚嶇О
+ * @return 閮ㄩ棬缂栧彿锛涘悕绉颁负绌烘椂杩斿洖 {@code null}
+ */
+ Long getOrCreateDeptByName(String name);
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
index 4f9b527..65b1875 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
@@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.system.api.dept;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import org.springframework.stereotype.Service;
@@ -51,4 +54,31 @@
return BeanUtils.toBean(childDeptList, DeptRespDTO.class);
}
+ @Override
+ public Long getOrCreateDeptByName(String name) {
+ String deptName = StrUtil.trim(name);
+ if (StrUtil.isEmpty(deptName)) {
+ return null;
+ }
+ List<DeptRespDTO> depts = getDeptList();
+ // 1. 宸插瓨鍦細鐩存帴澶嶇敤
+ for (DeptRespDTO dept : depts) {
+ if (deptName.equals(StrUtil.trim(dept.getName()))) {
+ return dept.getId();
+ }
+ }
+ // 2. 涓嶅瓨鍦細琛ュ缓鍒版牴閮ㄩ棬涓�
+ Long parentId = depts.stream()
+ .filter(dept -> dept.getParentId() == null || dept.getParentId() == 0L)
+ .map(DeptRespDTO::getId)
+ .findFirst()
+ .orElse(0L);
+ DeptSaveReqVO createReqVO = new DeptSaveReqVO();
+ createReqVO.setName(deptName);
+ createReqVO.setParentId(parentId);
+ createReqVO.setSort(0);
+ createReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+ return deptService.createDept(createReqVO);
+ }
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
index bced8f0..dd8996e 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java
@@ -34,6 +34,16 @@
*/
List<PostRespDTO> getPostList();
+ /**
+ * 鎸夊悕绉拌幏寰楀矖浣嶇紪鍙凤紝涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓
+ *
+ * <p>鐢ㄤ簬 Excel 瀵煎叆绛夈�屽彧鏈夊悕绉版病鏈夌紪鍙枫�嶇殑鍦烘櫙锛岄伩鍏嶅洜宀椾綅灏氭湭寤虹珛瀵艰嚧鏁存壒瀵煎叆澶辫触銆�
+ *
+ * @param name 宀椾綅鍚嶇О
+ * @return 宀椾綅缂栧彿锛涘悕绉颁负绌烘椂杩斿洖 {@code null}
+ */
+ Long getOrCreatePostByName(String name);
+
default Map<Long, PostRespDTO> getPostMap(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {
return MapUtil.empty();
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java
index 9d02d79..0186b41 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java
@@ -1,7 +1,10 @@
package cn.iocoder.yudao.module.system.api.dept;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import org.springframework.stereotype.Service;
@@ -38,4 +41,26 @@
return BeanUtils.toBean(list, PostRespDTO.class);
}
+ @Override
+ public Long getOrCreatePostByName(String name) {
+ String postName = StrUtil.trim(name);
+ if (StrUtil.isEmpty(postName)) {
+ return null;
+ }
+ List<PostRespDTO> posts = getPostList();
+ // 1. 宸插瓨鍦細鐩存帴澶嶇敤
+ for (PostRespDTO post : posts) {
+ if (postName.equals(StrUtil.trim(post.getName()))) {
+ return post.getId();
+ }
+ }
+ // 2. 涓嶅瓨鍦細琛ュ缓銆俢ode 蹇呭~涓旈渶鍞竴锛岀敤鏃堕棿鎴崇敓鎴�
+ PostSaveReqVO createReqVO = new PostSaveReqVO();
+ createReqVO.setName(postName);
+ createReqVO.setCode("POST_" + System.currentTimeMillis());
+ createReqVO.setSort(0);
+ createReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+ return postService.createPost(createReqVO);
+ }
+
}
--
Gitblit v1.9.3