From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 62d430c..ab70220 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,8 +1,9 @@
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.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import lombok.AllArgsConstructor;
@@ -11,35 +12,38 @@
@RestController
@RequestMapping("/staff/holidayApplication")
@AllArgsConstructor
-public class HolidayApplicationController extends BaseController {
+public class HolidayApplicationController {
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.listPage(page, holidayApplication));
+ public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
}
/**
* 鏂板璇峰亣鐢宠
*/
+ @Log(title = "鏂板璇峰亣鐢宠", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.save(holidayApplication));
+ public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.save(holidayApplication));
}
/**
* 淇敼璇峰亣鐢宠
*/
+ @Log(title = "淇敼璇峰亣鐢宠", businessType = BusinessType.UPDATE)
@PostMapping("/update")
- public R<?> update(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.updateById(holidayApplication));
+ public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
+ @Log(title = "鍒犻櫎璇峰亣鐢宠", businessType = BusinessType.DELETE)
@DeleteMapping("/delete/{id}")
- public R<?> delete(@PathVariable("id") Long id){
- return R.ok(holidayApplicationService.removeById(id));
+ public AjaxResult delete(@PathVariable("id") Long id){
+ return AjaxResult.success(holidayApplicationService.removeById(id));
}
}
--
Gitblit v1.9.3