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/approve/controller/ApproveNodeController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index a4d815e..cdd5e0a 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,14 +2,22 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+
+@Tag(name = "瀹℃壒璁板綍")
@RestController
@RequestMapping("/approveNode")
-public class ApproveNodeController {
- @Autowired
+@AllArgsConstructor
+public class ApproveNodeController extends BaseController {
+
private IApproveNodeService approveNodeService;
/**
@@ -17,9 +25,10 @@
* @param id 娴佺▼瀹℃壒id approve_id
* @return
*/
- @GetMapping("/details")
- public AjaxResult details(@PathVariable String id) {
- return AjaxResult.success(approveNodeService.details(id));
+ @GetMapping("/details/{id}")
+ @Operation(summary = "娴佺▼鐘舵�佽鎯�")
+ public R<?> details(@PathVariable String id) {
+ return R.ok(approveNodeService.details(id));
}
/**
@@ -28,9 +37,11 @@
* @return
*/
@PostMapping("/updateApproveNode")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) {
+ @Transactional(rollbackFor = Exception.class)
+ @Operation(summary = "瀹℃壒鑺傜偣")
+ public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -39,9 +50,9 @@
* @return
*/
@PostMapping("/init")
- public AjaxResult init(String id) {
- approveNodeService.initApproveNodes(id);
- return AjaxResult.success();
+ public R<?> init(String id) {
+ approveNodeService.initApproveNodes("",id,1L);
+ return R.ok();
}
}
--
Gitblit v1.9.3