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 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 4d4829a..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
@@ -222,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