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/approve/controller/ApproveNodeController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index cdd5e0a..d0af196 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,8 +2,7 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-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.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -16,7 +15,7 @@
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController extends BaseController {
+public class ApproveNodeController {
private IApproveNodeService approveNodeService;
@@ -27,8 +26,8 @@
*/
@GetMapping("/details/{id}")
@Operation(summary = "娴佺▼鐘舵�佽鎯�")
- public R<?> details(@PathVariable String id) {
- return R.ok(approveNodeService.details(id));
+ public AjaxResult details(@PathVariable String id) {
+ return AjaxResult.success(approveNodeService.details(id));
}
/**
@@ -39,9 +38,9 @@
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "瀹℃壒鑺傜偣")
- public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
+ public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -50,9 +49,9 @@
* @return
*/
@PostMapping("/init")
- public R<?> init(String id) {
+ public AjaxResult init(String id) {
approveNodeService.initApproveNodes("",id,1L);
- return R.ok();
+ return AjaxResult.success();
}
}
--
Gitblit v1.9.3