From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
index c7225c2..36dcfc3 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
@@ -4,6 +4,9 @@
import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
import com.ruoyi.approve.service.ApprovalInstanceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,28 +27,32 @@
@RequestMapping("/approvalInstance")
@Tag(name = "瀹℃壒瀹炰緥琛�")
@AllArgsConstructor
-public class ApprovalInstanceController {
+public class ApprovalInstanceController extends BaseController {
private final ApprovalInstanceService approvalInstanceService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒鍒楄〃鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.listPage(page, approvalInstanceDto);
}
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
+ @Log(title = "瀹℃壒鍒楄〃淇濆瓨", businessType = BusinessType.INSERT)
public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
}
@PutMapping("/update")
@Operation(summary = "鏇存柊")
+ @Log(title = "瀹℃壒鍒楄〃鏇存柊", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
- return approvalInstanceService.updateById(approvalInstanceDto) ? R.ok() : R.fail();
+ return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
+ @Log(title = "瀹℃壒鍒楄〃鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
public R delete(@RequestBody List<Long> ids) {
return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
@@ -53,6 +60,7 @@
@Operation(summary = "瀹℃壒")
@PostMapping("/approve")
+ @Log(title = "瀹℃壒鍒楄〃瀹℃壒", businessType = BusinessType.UPDATE)
public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.approve(approvalInstanceDto);
}
--
Gitblit v1.9.3