From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 4e93b5f..10b8481 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -1,12 +1,14 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+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;
@@ -22,30 +24,32 @@
*/
@RestController
@RequestMapping("/personalAttendanceRecords")
-@Api(tags = "浜哄憳鎵撳崱绛惧埌")
+@Tag(name = "浜哄憳鎵撳崱绛惧埌")
public class PersonalAttendanceRecordsController {
@Resource
private PersonalAttendanceRecordsService personalAttendanceRecordsService;
- @ApiOperation("鏂板鎵撳崱绛惧埌")
+ @Log(title = "涓汉鑰冨嫟璁板綍", businessType = BusinessType.INSERT)
+ @Operation(summary = "鏂板鎵撳崱绛惧埌")
@PostMapping("")
public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
}
- @ApiOperation("鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
@GetMapping("/listPage")
public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
}
- @ApiOperation("鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
+ @Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
@GetMapping("/today")
public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
}
- @ApiOperation("瀵煎嚭鎵撳崱绛惧埌")
+ @Log(title = "涓汉鑰冨嫟璁板綍", businessType = BusinessType.EXPORT)
+ @Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
@PostMapping("/export")
public void export(HttpServletResponse response, PersonalAttendanceRecordsDto personalAttendanceRecordsDto) {
personalAttendanceRecordsService.export(response, personalAttendanceRecordsDto);
--
Gitblit v1.9.3