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/collaborativeApproval/controller/DutyPlanController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index 8be45b5..d622e99 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -7,8 +7,7 @@
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,39 +20,39 @@
@RestController
@RequestMapping("/dutyPlan")
@AllArgsConstructor
-public class DutyPlanController extends BaseController {
+public class DutyPlanController {
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, DutyPlanDTO dutyPlanDTO){
- return R.ok(dutyPlanService.listPage(page, dutyPlanDTO));
+ public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
+ return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
@Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
- public R<?> getNum(){
- return R.ok(dutyPlanService.getNum());
+ public AjaxResult getNum(){
+ return AjaxResult.success(dutyPlanService.getNum());
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody DutyPlan dutyPlan){
- return R.ok(dutyPlanService.save(dutyPlan));
+ public AjaxResult add(@RequestBody DutyPlan dutyPlan){
+ return AjaxResult.success(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody DutyPlan dutyPlan){
- return R.ok(dutyPlanService.updateById(dutyPlan));
+ public AjaxResult update(@RequestBody DutyPlan dutyPlan){
+ return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(dutyPlanService.removeBatchByIds(ids));
+ return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
@Operation(summary = "瀵煎嚭")
--
Gitblit v1.9.3