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 | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..80d6bd8 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,14 +2,23 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+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")
+@AllArgsConstructor
public class ApproveNodeController {
- @Autowired
+
private IApproveNodeService approveNodeService;
/**
@@ -17,7 +26,8 @@
* @param id 娴佺▼瀹℃壒id approve_id
* @return
*/
- @GetMapping("/details")
+ @GetMapping("/details/{id}")
+ @Operation(summary = "娴佺▼鐘舵�佽鎯�")
public AjaxResult details(@PathVariable String id) {
return AjaxResult.success(approveNodeService.details(id));
}
@@ -27,8 +37,11 @@
* @param approveNode
* @return
*/
+ @Log(title = "瀹℃壒鑺傜偣", businessType = BusinessType.UPDATE)
@PostMapping("/updateApproveNode")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) {
+ @Transactional(rollbackFor = Exception.class)
+ @Operation(summary = "瀹℃壒鑺傜偣")
+ public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
return AjaxResult.success();
}
@@ -38,9 +51,10 @@
* @param id
* @return
*/
+ @Log(title = "鍒濆鍖栧鎵硅妭鐐�", businessType = BusinessType.INSERT)
@PostMapping("/init")
public AjaxResult init(String id) {
- approveNodeService.initApproveNodes(id);
+ approveNodeService.initApproveNodes("",id,1L);
return AjaxResult.success();
}
--
Gitblit v1.9.3