From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index c018008..585a249 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -1,15 +1,16 @@
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.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -17,8 +18,8 @@
*/
@RestController
@RequestMapping("/staff/staffLeave")
-@Api(tags = "鍛樺伐绂昏亴")
-public class StaffLeaveController {
+@Tag(name = "鍛樺伐绂昏亴")
+public class StaffLeaveController extends BaseController {
@Resource
private StaffLeaveService staffLeaveService;
/**
@@ -28,8 +29,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
+ public R<?> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
}
/**
@@ -38,8 +39,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
+ public R<?> add(@RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.add(staffLeaveDto));
}
/**
@@ -49,8 +50,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.update(id, staffLeaveDto));
}
/**
@@ -59,11 +60,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult del(@RequestBody List<Integer> ids) {
+ public R<?> del(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffLeaveService.del(ids));
+ return R.ok(staffLeaveService.del(ids));
}
/**
--
Gitblit v1.9.3