From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
index 53e918e..2f1496b 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
@@ -12,8 +12,9 @@
import com.ruoyi.staff.service.PersonalShiftService;
import com.ruoyi.staff.utils.StyleMonthUtils;
import com.ruoyi.staff.utils.StyleYearUtils;
-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 lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,38 +35,38 @@
*/
@RestController
@RequestMapping("/personalShift")
-@Api(tags = "浜哄憳鎺掔彮")
+@Tag(name = "浜哄憳鎺掔彮")
+@AllArgsConstructor
public class PersonalShiftController {
- @Autowired
private PersonalShiftService personalShiftService;
- @ApiOperation("浜哄憳鎺掔彮")
+ @Operation(summary = "浜哄憳鎺掔彮")
@PostMapping("/add")
public R add(@RequestBody PerformanceShiftAddDto performanceShiftAddDto){
return R.ok(personalShiftService.performanceShiftAdd(performanceShiftAddDto));
}
- @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏈堜唤鍒嗛〉鏌ヨ")
@GetMapping("page")
public R performanceShiftPage(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
return R.ok(personalShiftService.performanceShiftPage(new Page<>(current, size), time, userName, sysDeptId));
}
- @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
+ @Operation(summary = "骞翠唤鍒嗛〉鏌ヨ")
@GetMapping("pageYear")
public R performanceShiftPageYear(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
return R.ok(personalShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, sysDeptId));
}
- @ApiOperation(value = "鐝鐘舵�佷慨鏀�")
+ @Operation(summary = "鐝鐘舵�佷慨鏀�")
@PostMapping("update")
public R performanceShiftUpdate(@RequestBody PersonalShift personalShift) {
personalShiftService.performanceShiftUpdate(personalShift);
return R.ok();
}
- @ApiOperation(value = "瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@GetMapping("export")
public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, Integer sysDeptId, Boolean isMonth, HttpServletResponse response) throws Exception {
ServletOutputStream out = response.getOutputStream();
--
Gitblit v1.9.3