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/HolidayApplicationController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 7ac13bd..62d430c 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,44 +1,45 @@
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.pojo.HolidayApplication;
-import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.HolidayApplicationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/staff/holidayApplication")
-public class HolidayApplicationController {
- @Autowired
+@AllArgsConstructor
+public class HolidayApplicationController extends BaseController {
+
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
+ public R<?> listPage(Page page, HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.listPage(page, holidayApplication));
}
/**
* 鏂板璇峰亣鐢宠
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.save(holidayApplication));
+ public R<?> add(@RequestBody HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.save(holidayApplication));
}
/**
* 淇敼璇峰亣鐢宠
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
+ public R<?> update(@RequestBody HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.updateById(holidayApplication));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
@DeleteMapping("/delete/{id}")
- public AjaxResult delete(@PathVariable("id") Long id){
- return AjaxResult.success(holidayApplicationService.removeById(id));
+ public R<?> delete(@PathVariable("id") Long id){
+ return R.ok(holidayApplicationService.removeById(id));
}
}
--
Gitblit v1.9.3