From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
index 4c992568..08dec28 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
@@ -6,6 +6,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.HrmAttendanceHolidayImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidayRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceHolidaySaveReqVO;
@@ -22,6 +25,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -63,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃�")
@Parameter(name = "id", description = "鑺傚亣鏃D", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
public CommonResult<HrmAttendanceHolidayRespVO> getAttendanceHoliday(@RequestParam("id") Long id) {
HrmAttendanceHolidayDO attendanceHoliday = attendanceHolidayService.getAttendanceHoliday(id);
return success(BeanUtils.toBean(attendanceHoliday, HrmAttendanceHolidayRespVO.class));
@@ -71,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃垎椤�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
public CommonResult<PageResult<HrmAttendanceHolidayRespVO>> getAttendanceHolidayPage(@Valid HrmAttendanceHolidayPageReqVO pageReqVO) {
PageResult<HrmAttendanceHolidayDO> pageResult = attendanceHolidayService.getAttendanceHolidayPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, HrmAttendanceHolidayRespVO.class));
@@ -79,7 +82,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑺傚亣鏃ラ厤缃� Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:attendance:export', 'hrm:attendance-holiday:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceHolidayExcel(@Valid HrmAttendanceHolidayPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -89,4 +92,25 @@
ExcelUtils.write(response, "鑺傚亣鏃ラ厤缃�.xls", "鏁版嵁", HrmAttendanceHolidayRespVO.class, data);
}
-}
\ No newline at end of file
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鑺傚亣鏃ラ厤缃ā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmAttendanceHolidayImportExcelVO> list = Arrays.asList(
+ HrmAttendanceHolidayImportExcelVO.builder().name("鏄ヨ妭").date(LocalDate.of(2026, 2, 17))
+ .type(1).isLegal(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "鑺傚亣鏃ラ厤缃鍏ユā鏉�.xls", "鑺傚亣鏃ラ厤缃垪琛�", HrmAttendanceHolidayImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鑺傚亣鏃ラ厤缃�")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:import')")
+ public CommonResult<HrmAttendanceHolidayImportRespVO> importExcel(@Valid HrmAttendanceHolidayImportReqVO importReqVO)
+ throws Exception {
+ List<HrmAttendanceHolidayImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmAttendanceHolidayImportExcelVO.class);
+ return success(attendanceHolidayService.importAttendanceHolidayList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3