From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 1bf6b06..95f3105 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -1,14 +1,17 @@
 package com.ruoyi.staff.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
-import com.ruoyi.staff.pojo.HolidayApplication;
 import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
-import com.ruoyi.staff.service.HolidayApplicationService;
 import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.web.bind.annotation.*;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -20,24 +23,33 @@
  */
 @RestController
 @RequestMapping("/personalAttendanceRecords")
-public class PersonalAttendanceRecordsController {
-    @Autowired
+@Tag(name = "浜哄憳鎵撳崱绛惧埌")
+public class PersonalAttendanceRecordsController extends BaseController {
+    @Resource
     private PersonalAttendanceRecordsService personalAttendanceRecordsService;
 
-    // 鏂板
+    @Operation(summary = "鏂板鎵撳崱绛惧埌")
     @PostMapping("")
-    public AjaxResult add(@RequestBody PersonalAttendanceRecords personalAttendanceRecord){
-        return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecord));
+    public R<?> add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+        return R.ok(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
     }
 
-    // 鍒楄〃鏌ヨ
+    @Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
     @GetMapping("/listPage")
-    public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
-        return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
+    public R<?> listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+        return R.ok(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
     }
 
+    @Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
     @GetMapping("/today")
-    public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
-        return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
+    public R<?> todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+        return R.ok(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
     }
+
+    @Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PersonalAttendanceRecordsDto personalAttendanceRecordsDto) {
+        personalAttendanceRecordsService.export(response, personalAttendanceRecordsDto);
+    }
+
 }

--
Gitblit v1.9.3