From 531b50cab6e42e6146a419bc71c5b494fff774b2 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 27 十月 2026 09:48:33 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持 Excel 导入；修复定位打卡测试类编译错误
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
index 61c3d9d..41b5a73 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRulePageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleSaveReqVO;
@@ -25,6 +28,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,14 +49,14 @@
@PostMapping("/create")
@Operation(summary = "鏂板鑰冨嫟瑙勫垯")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:create')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:create')")
public CommonResult<Long> createAttendanceRule(@Valid @RequestBody HrmAttendanceRuleSaveReqVO createReqVO) {
return success(attendanceRuleService.createAttendanceRule(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鑰冨嫟瑙勫垯")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:update')")
public CommonResult<Boolean> updateAttendanceRule(@Valid @RequestBody HrmAttendanceRuleSaveReqVO updateReqVO) {
attendanceRuleService.updateAttendanceRule(updateReqVO);
return success(true);
@@ -60,7 +65,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鑰冨嫟瑙勫垯")
@Parameter(name = "id", description = "瑙勫垯ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:delete')")
public CommonResult<Boolean> deleteAttendanceRule(@RequestParam("id") Long id) {
attendanceRuleService.deleteAttendanceRule(id);
return success(true);
@@ -69,7 +74,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯")
@Parameter(name = "id", description = "瑙勫垯ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<HrmAttendanceRuleRespVO> getAttendanceRule(@RequestParam("id") Long id) {
HrmAttendanceRuleDO attendanceRule = attendanceRuleService.getAttendanceRule(id);
if (attendanceRule == null) {
@@ -88,7 +93,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<PageResult<HrmAttendanceRuleRespVO>> getAttendanceRulePage(@Valid HrmAttendanceRulePageReqVO pageReqVO) {
PageResult<HrmAttendanceRuleDO> pageResult = attendanceRuleService.getAttendanceRulePage(pageReqVO);
List<HrmAttendanceRuleRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmAttendanceRuleRespVO.class);
@@ -111,7 +116,7 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯鍒楄〃")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<List<HrmAttendanceRuleRespVO>> getAttendanceRuleList() {
List<HrmAttendanceRuleDO> list = attendanceRuleService.getAttendanceRuleList();
return success(BeanUtils.toBean(list, HrmAttendanceRuleRespVO.class));
@@ -119,7 +124,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟瑙勫垯 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceRuleExcel(@Valid HrmAttendanceRulePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -129,4 +134,27 @@
ExcelUtils.write(response, "鑰冨嫟瑙勫垯.xls", "鏁版嵁", HrmAttendanceRuleRespVO.class, data);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鑰冨嫟瑙勫垯妯℃澘")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmAttendanceRuleImportExcelVO> list = Collections.singletonList(
+ HrmAttendanceRuleImportExcelVO.builder().name("鏍囧噯鑰冨嫟瑙勫垯").deptName("鐮斿彂閮�")
+ .workStartTime(LocalTime.of(9, 0)).workEndTime(LocalTime.of(18, 0))
+ .lateAllowMinutes(10).earlyAllowMinutes(10).overtimeThreshold(BigDecimal.ONE)
+ .status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鑰冨嫟瑙勫垯瀵煎叆妯℃澘.xls", "鑰冨嫟瑙勫垯鍒楄〃", HrmAttendanceRuleImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鑰冨嫟瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:import')")
+ public CommonResult<HrmAttendanceRuleImportRespVO> importExcel(@Valid HrmAttendanceRuleImportReqVO importReqVO)
+ throws Exception {
+ List<HrmAttendanceRuleImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmAttendanceRuleImportExcelVO.class);
+ return success(attendanceRuleService.importAttendanceRuleList(list, importReqVO));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3