fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）

xiaoyi

6 天以前 481d8165f26fc7e37f0e87f6444ac0340bb563a3

 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 = "节假日ID", 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);
    }

}
    @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));
    }

}