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/StaffSchedulingController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
index d195e9c..a49809a 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
@@ -5,7 +5,8 @@
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.SaveStaffSchedulingDto;
import com.ruoyi.staff.dto.StaffSchedulingDto;
import com.ruoyi.staff.service.StaffSchedulingService;
@@ -26,39 +27,39 @@
@RestController
@RequestMapping("/staff/staffScheduling")
@RequiredArgsConstructor
-public class StaffSchedulingController {
+public class StaffSchedulingController extends BaseController {
private final StaffSchedulingService staffSchedulingService;
@PostMapping("/listPage")
- public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
- return AjaxResult.success(staffSchedulingService.listPage(vo));
+ public R<?> listPage(@RequestBody SearchSchedulingVo vo){
+ return R.ok(staffSchedulingService.listPage(vo));
}
@PostMapping("/save")
- public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
+ public R<?> save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/delByIds")
- public AjaxResult delByIds(@RequestBody List<Integer> ids){
+ public R<?> delByIds(@RequestBody List<Integer> ids){
staffSchedulingService.removeByIds(ids);
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/del/{id}")
- public AjaxResult del(@PathVariable("id") Integer id){
+ public R<?> del(@PathVariable("id") Integer id){
staffSchedulingService.removeById(id);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 鑾峰彇褰撳墠鐢ㄦ埛鏈�鏂版帓鐝褰�
*/
@GetMapping("/getCurrentUserLatestScheduling")
- public AjaxResult getCurrentUserLatestScheduling(){
- return AjaxResult.success(staffSchedulingService.getCurrentUserLatestScheduling());
+ public R<?> getCurrentUserLatestScheduling(){
+ return R.ok(staffSchedulingService.getCurrentUserLatestScheduling());
}
@Log(title = "瀵煎嚭浜哄憳鎺掔彮鍒楄〃", businessType = BusinessType.EXPORT)
--
Gitblit v1.9.3