From 89071e0c09188d75c3d537f82204ae19713ac7fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 12 十月 2026 10:09:33 +0800
Subject: [PATCH] feat(hrm): 合同生成与模板下载、员工转正、导入导出字段对齐
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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..0e07916 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 骞跺～鍏呰鑹插悕绉�
@@ -195,7 +204,7 @@
// 杈撳嚭绀轰緥鏁版嵁锛屾柟渚夸娇鐢ㄨ�呭弬鑰�
List<HrmEmployeeImportExcelVO> list = Arrays.asList(
HrmEmployeeImportExcelVO.builder().name("寮犱笁").gender(1).phone("13800138000")
- .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊").roleNames("鏅�氱鐞嗗憳")
+ .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊,椤圭洰缁忕悊").roleNames("鏅�氱鐞嗗憳")
.hireDate(LocalDate.of(2020, 3, 1)).employeeStatus(1)
.idCard("320102199001150011").birthday(LocalDate.of(1990, 1, 15))
.nation("姹夋棌").marriageStatus("宸插").age(36).education("鏈").politicalStatus("涓叡鍏氬憳")
@@ -213,4 +222,22 @@
return success(employeeService.importEmployeeList(list, importReqVO));
}
+ @PutMapping("/regular")
+ @Operation(summary = "鍛樺伐杞", description = "浠呫�庡姵鍔ㄥ悎鍚屻�忓憳宸ュ彲杞锛涘姵鍔″悎鍚屼笉杞銆傝浆姝ｅ彧鏀圭姸鎬�+杞鏃ユ湡锛屼笉鍚皟宀�")
+ @Parameter(name = "id", description = "鍛樺伐ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:employee:update')")
+ public CommonResult<Boolean> regularizeEmployee(@RequestParam("id") Long id) {
+ employeeService.regularizeEmployee(id);
+ return success(true);
+ }
+
+ @GetMapping("/regularize-reminders")
+ @Operation(summary = "鑾峰緱寰呰浆姝ｆ彁閱掑垪琛�", description = "璇曠敤涓�佷笖褰撳墠涓哄姵鍔ㄥ悎鍚屻�佽瘯鐢ㄦ湡鍦� days 澶╁唴鍒版湡鐨勫憳宸�")
+ @PreAuthorize("@ss.hasPermission('hrm:employee:query')")
+ public CommonResult<List<HrmEmployeeRespVO>> getRegularizeReminders(
+ @RequestParam(value = "days", required = false, defaultValue = "7") Integer days) {
+ List<HrmEmployeeDO> list = employeeService.getRegularizeReminderList(days);
+ return success(BeanUtils.toBean(list, HrmEmployeeRespVO.class));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3