From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 21 ++++++++++++---------
1 files changed, 12 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..80d6bd8 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,8 +2,9 @@
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.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+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 +17,7 @@
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController extends BaseController {
+public class ApproveNodeController {
private IApproveNodeService approveNodeService;
@@ -27,8 +28,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));
}
/**
@@ -36,12 +37,13 @@
* @param approveNode
* @return
*/
+ @Log(title = "瀹℃壒鑺傜偣", businessType = BusinessType.UPDATE)
@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();
}
/**
@@ -49,10 +51,11 @@
* @param id
* @return
*/
+ @Log(title = "鍒濆鍖栧鎵硅妭鐐�", businessType = BusinessType.INSERT)
@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