From 9883e37f3468875829f4808bf4813410f8e29f74 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 九月 2025 20:47:09 +0800
Subject: [PATCH] Merge branch 'feature_asset'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
index c682d44..25826b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowNodeController.java
@@ -1,8 +1,23 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.dto.SetApprovalDTO;
+import com.ruoyi.system.dto.SetDeptDTO;
+import com.ruoyi.system.model.OaApproval;
+import com.ruoyi.system.model.OaApprovalFlowNode;
+import com.ruoyi.system.query.ApprovalListQuery;
+import com.ruoyi.system.service.OaApprovalFlowNodeService;
+import com.ruoyi.system.service.OaApprovalService;
+import com.ruoyi.system.vo.system.ApprovalFlowNodeVO;
+import com.ruoyi.system.vo.system.ApprovalVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -13,8 +28,43 @@
* @since 2025-09-15
*/
@RestController
+@Api("审批流程")
@RequestMapping("/oa-approval-flow-node")
public class OaApprovalFlowNodeController {
+ @Resource
+ private OaApprovalFlowNodeService oaApprovalFlowNodeService;
+ /**
+ * 获取部门树列表
+ */
+ @ApiOperation("审批流程设计列表")
+ @PostMapping("/pageList")
+ public R<List<OaApprovalFlowNode>> pageList(@RequestBody ApprovalListQuery query) {
+ return R.ok( oaApprovalFlowNodeService.pageList(query));
+ }
+ @ApiOperation(value = "启用禁用")
+ @GetMapping(value = "/updateStatus")
+ public R updateStatus(Integer id ) {
+ OaApprovalFlowNode approval = oaApprovalFlowNodeService.getById(id);
+ approval.setStatus(!approval.getStatus());
+ oaApprovalFlowNodeService.updateById(approval);
+ return R.ok();
+ }
+ @ApiOperation(value = "是否需要签名")
+ @GetMapping(value = "/updateSign")
+ public R updateSign(Integer id ) {
+ OaApprovalFlowNode approval = oaApprovalFlowNodeService.getById(id);
+ approval.setSignFlag(!approval.getSignFlag());
+ oaApprovalFlowNodeService.updateById(approval);
+ return R.ok();
+ }
+ @ApiOperation(value = "设置审批人")
+ @PostMapping(value = "/setApproval")
+ public R setDept(@RequestBody SetApprovalDTO dto) {
+ OaApprovalFlowNode approval = oaApprovalFlowNodeService.getById(dto.getId());
+ approval.setApprovalIds(dto.getApprovalIds());
+ oaApprovalFlowNodeService.updateById(approval);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1