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