From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index e33cee8..cdd5e0a 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,20 +2,21 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+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;
-@Api(tags = "瀹℃壒璁板綍")
+@Tag(name = "瀹℃壒璁板綍")
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController {
+public class ApproveNodeController extends BaseController {
private IApproveNodeService approveNodeService;
@@ -25,9 +26,9 @@
* @return
*/
@GetMapping("/details/{id}")
- @ApiOperation(value = "娴佺▼鐘舵�佽鎯�")
- public AjaxResult details(@PathVariable String id) {
- return AjaxResult.success(approveNodeService.details(id));
+ @Operation(summary = "娴佺▼鐘舵�佽鎯�")
+ public R<?> details(@PathVariable String id) {
+ return R.ok(approveNodeService.details(id));
}
/**
@@ -37,10 +38,10 @@
*/
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "瀹℃壒鑺傜偣")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
+ @Operation(summary = "瀹℃壒鑺傜偣")
+ public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -49,9 +50,9 @@
* @return
*/
@PostMapping("/init")
- public AjaxResult init(String id) {
+ public R<?> init(String id) {
approveNodeService.initApproveNodes("",id,1L);
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3