From 343de424ab52d06c058c9da9dd6ae6f5ffc8ffb6 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 31 三月 2024 15:51:21 +0800
Subject: [PATCH] update 调整流程定义配置注释
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
index f84f1db..d494959 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
@@ -1,5 +1,6 @@
package org.dromara.workflow.controller;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
@@ -12,15 +13,18 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
+import org.dromara.workflow.domain.WfTaskBackNode;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.service.IActTaskService;
+import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.QueryUtils;
-import org.dromara.workflow.utils.WorkflowUtils;
import org.flowable.engine.TaskService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
/**
@@ -37,6 +41,8 @@
private final IActTaskService actTaskService;
private final TaskService taskService;
+
+ private final IWfTaskBackNodeService iWfTaskBackNodeService;
/**
@@ -218,7 +224,7 @@
@Log(title = "浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/backProcess")
- public R<String> backProcess(@RequestBody BackProcessBo backProcessBo) {
+ public R<String> backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) {
return R.ok(actTaskService.backProcess(backProcessBo));
}
@@ -245,4 +251,24 @@
public R<Void> updateAssignee(@PathVariable String[] taskIds, @PathVariable String userId) {
return toAjax(actTaskService.updateAssignee(taskIds, userId));
}
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ */
+ @GetMapping("/getInstanceVariable/{taskId}")
+ public R<List<VariableVo>> getProcessInstVariable(@PathVariable String taskId) {
+ return R.ok(actTaskService.getInstanceVariable(taskId));
+ }
+
+ /**
+ * 鑾峰彇鍙┏鍥炲緱浠诲姟鑺傜偣
+ *
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ @GetMapping("/getTaskNodeList/{processInstanceId}")
+ public R<List<WfTaskBackNode>> getNodeList(@PathVariable String processInstanceId) {
+ return R.ok(CollUtil.reverse(iWfTaskBackNodeService.getListByInstanceId(processInstanceId)));
+ }
}
--
Gitblit v1.9.3