From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index 585a249..64a35d9 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -19,7 +18,7 @@
@RestController
@RequestMapping("/staff/staffLeave")
@Tag(name = "鍛樺伐绂昏亴")
-public class StaffLeaveController extends BaseController {
+public class StaffLeaveController {
@Resource
private StaffLeaveService staffLeaveService;
/**
@@ -29,8 +28,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
+ public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
}
/**
@@ -39,8 +38,8 @@
* @return
*/
@PostMapping("")
- public R<?> add(@RequestBody StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.add(staffLeaveDto));
+ public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
}
/**
@@ -50,8 +49,8 @@
* @return
*/
@PutMapping("/{id}")
- public R<?> update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.update(id, staffLeaveDto));
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
}
/**
@@ -60,11 +59,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> del(@RequestBody List<Integer> ids) {
+ public AjaxResult del(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(staffLeaveService.del(ids));
+ return AjaxResult.success(staffLeaveService.del(ids));
}
/**
--
Gitblit v1.9.3