From 68317d44b233f28150336bbf3aa3a32400552437 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 11:02:08 +0800
Subject: [PATCH] fix(excel): 导入模板日期改为文本显示，修复显示为 Excel 序列号
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
index 989e1ce..3684571 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
@@ -115,10 +115,12 @@
Map<Long, DeptRespDTO> deptMap = CollUtil.isEmpty(deptIds) ? Collections.emptyMap() : deptApi.getDeptMap(deptIds);
// 2. 鎵归噺鑾峰彇宀椾綅淇℃伅
- Set<Long> postIds = employeeList.stream()
- .map(HrmEmployeeDO::getPostId)
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
+ Set<Long> postIds = new HashSet<>();
+ for (HrmEmployeeDO employee : employeeList) {
+ if (StrUtil.isNotBlank(employee.getPostIds())) {
+ postIds.addAll(JSONUtil.toList(employee.getPostIds(), Long.class));
+ }
+ }
Map<Long, PostRespDTO> postMap = CollUtil.isEmpty(postIds) ? Collections.emptyMap() : postApi.getPostMap(postIds);
// 3. 鏀堕泦鎵�鏈夎鑹睮D
@@ -143,9 +145,16 @@
respVO.setDeptName(deptMap.get(employee.getDeptId()).getName());
}
- // 濉厖宀椾綅鍚嶇О
- if (employee.getPostId() != null && postMap.containsKey(employee.getPostId())) {
- respVO.setPostName(postMap.get(employee.getPostId()).getName());
+ // 濉厖宀椾綅淇℃伅
+ if (StrUtil.isNotBlank(employee.getPostIds())) {
+ List<Long> employeePostIds = JSONUtil.toList(employee.getPostIds(), Long.class);
+ respVO.setPostIds(employeePostIds);
+ if (CollUtil.isNotEmpty(employeePostIds)) {
+ respVO.setPostNames(employeePostIds.stream()
+ .filter(postMap::containsKey)
+ .map(id -> postMap.get(id).getName())
+ .collect(Collectors.joining(",")));
+ }
}
// 瑙ｆ瀽 roleIds 骞跺～鍏呰鑹插悕绉�
@@ -192,16 +201,28 @@
@Operation(summary = "涓嬭浇鍛樺伐瀵煎叆妯℃澘")
@PreAuthorize("@ss.hasPermission('hrm:employee:import')")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 杈撳嚭绀轰緥鏁版嵁锛屾柟渚夸娇鐢ㄨ�呭弬鑰�
+ // 绀轰緥鐨勯儴闂�/宀椾綅/瑙掕壊鍙栧綋鍓嶇郴缁熺湡瀹炴暟鎹紝閬垮厤鐓ф妱 demo 閲岀殑銆岀爺鍙戦儴銆嶅鑷村尮閰嶅け璐�
+ String sampleDept = "璇峰～鍐欓儴闂ㄥ悕绉�";
+ try {
+ var depts = deptApi.getDeptList();
+ if (depts != null && !depts.isEmpty()) {
+ sampleDept = depts.get(0).getName();
+ }
+ } catch (Exception ignored) {
+ // 鍙栦笉鍒板氨淇濈暀鍗犱綅鏂囨锛屼笉褰卞搷妯℃澘涓嬭浇
+ }
+ // 宀椾綅鏈彁渚涚畝鏄撳垪琛� API锛岀ず渚嬬敤鍗犱綅鏂囨
+ String samplePost = "璇峰～鍐欏矖浣嶅悕绉帮紙澶氫釜鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛�";
+
List<HrmEmployeeImportExcelVO> list = Arrays.asList(
HrmEmployeeImportExcelVO.builder().name("寮犱笁").gender(1).phone("13800138000")
- .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊").roleNames("鏅�氱鐞嗗憳")
+ .deptName(sampleDept).postName(samplePost).roleNames("鏅�氳鑹�")
.hireDate(LocalDate.of(2020, 3, 1)).employeeStatus(1)
.idCard("320102199001150011").birthday(LocalDate.of(1990, 1, 15))
.nation("姹夋棌").marriageStatus("宸插").age(36).education("鏈").politicalStatus("涓叡鍏氬憳")
- .email("zhangsan@example.com").build()
+ .email("zhangsan@example.com").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").build()
);
- ExcelUtils.write(response, "鍛樺伐瀵煎叆妯℃澘.xls", "鍛樺伐鍒楄〃", HrmEmployeeImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍛樺伐瀵煎叆妯℃澘.xls", "鍛樺伐鍒楄〃", HrmEmployeeImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3