From ce5f8a87bb5d411bae67c39b269d879677bb98da Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:29:25 +0800
Subject: [PATCH] feat(hrm): 请假导入、加班代申请、批量排班与考勤应出勤重算
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
index d9c362a..6d1c7da 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmEmployeeScheduleController.java
@@ -1,6 +1,9 @@
package cn.iocoder.yudao.module.hrm.controller.admin.attendance;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchAssignReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleBatchAssignRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleLeaveRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleListReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmEmployeeScheduleSaveReqVO;
@@ -28,12 +31,26 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鏌愭湀鍛樺伐鎺掔彮鍒楄〃")
- @PreAuthorize("@ss.hasPermission('hrm:employee-schedule:query')")
public CommonResult<List<HrmEmployeeScheduleRespVO>> getEmployeeScheduleList(
@Valid HrmEmployeeScheduleListReqVO reqVO) {
return success(employeeScheduleService.getScheduleList(reqVO));
}
+ @GetMapping("/leave-list")
+ @Operation(summary = "鑾峰緱鎺掔彮椤佃鍋囨爣璁板垪琛紙宸插鎵归�氳繃锛屾寜澶╁睍寮�锛�")
+ public CommonResult<List<HrmEmployeeScheduleLeaveRespVO>> getScheduleLeaveList(
+ @Valid HrmEmployeeScheduleListReqVO reqVO) {
+ return success(employeeScheduleService.getScheduleLeaveList(reqVO));
+ }
+
+ @PostMapping("/batch-assign")
+ @Operation(summary = "鎵归噺鎺掔彮锛堟寜閮ㄩ棬鍚笅绾� + 宀椾綅 + 鍛樺伐鐘舵�侊紝璺宠繃宸插鎵硅鍋囷級")
+ @PreAuthorize("@ss.hasPermission('hrm:employee-schedule:save')")
+ public CommonResult<HrmEmployeeScheduleBatchAssignRespVO> batchAssign(
+ @Valid @RequestBody HrmEmployeeScheduleBatchAssignReqVO reqVO) {
+ return success(employeeScheduleService.batchAssign(reqVO));
+ }
+
@PostMapping("/save")
@Operation(summary = "鎵归噺淇濆瓨鍛樺伐鎺掔彮锛堟暣鏈堣鐩栧紡锛�")
@PreAuthorize("@ss.hasPermission('hrm:employee-schedule:save')")
--
Gitblit v1.9.3