From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 21 ++++++++++-----------
1 files changed, 10 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..6498ef9 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.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.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import lombok.AllArgsConstructor;
@@ -11,35 +10,35 @@
@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));
}
/**
* 鏂板璇峰亣鐢宠
*/
@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));
}
/**
* 淇敼璇峰亣鐢宠
*/
@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));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
@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