From 1da98c8a8207dd062e433242e1567b6418c6ed81 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 06 四月 2024 11:20:29 +0800
Subject: [PATCH] update 优化表单绑定逻辑，移除流程定义配置表单
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 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 7bf61a7..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;
@@ -8,17 +9,22 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
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.utils.WorkflowUtils;
+import org.dromara.workflow.service.IWfTaskBackNodeService;
+import org.dromara.workflow.utils.QueryUtils;
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;
/**
@@ -35,6 +41,8 @@
private final IActTaskService actTaskService;
private final TaskService taskService;
+
+ private final IWfTaskBackNodeService iWfTaskBackNodeService;
/**
@@ -67,9 +75,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskWaitByPage")
- public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
- return actTaskService.getTaskWaitByPage(taskBo);
+ @GetMapping("/getPageByTaskWait")
+ public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskWait(taskBo, pageQuery);
}
/**
@@ -77,9 +85,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getAllTaskWaitByPage")
- public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
- return actTaskService.getAllTaskWaitByPage(taskBo);
+ @GetMapping("/getPageByAllTaskWait")
+ public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByAllTaskWait(taskBo, pageQuery);
}
/**
@@ -87,9 +95,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskFinishByPage")
- public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
- return actTaskService.getTaskFinishByPage(taskBo);
+ @GetMapping("/getPageByTaskFinish")
+ public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskFinish(taskBo, pageQuery);
}
/**
@@ -97,9 +105,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskCopyByPage")
- public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
- return actTaskService.getTaskCopyByPage(taskBo);
+ @GetMapping("/getPageByTaskCopy")
+ public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskCopy(taskBo, pageQuery);
}
/**
@@ -107,9 +115,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getAllTaskFinishByPage")
- public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
- return actTaskService.getAllTaskFinishByPage(taskBo);
+ @GetMapping("/getPageByAllTaskFinish")
+ public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery);
}
/**
@@ -216,18 +224,18 @@
@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));
}
/**
- * 鑾峰彇娴佺▼鐘舵��
+ * 鑾峰彇褰撳墠浠诲姟
*
* @param taskId 浠诲姟id
*/
- @GetMapping("/getBusinessStatus/{taskId}")
- public R<String> getBusinessStatus(@PathVariable String taskId) {
- return R.ok("鎿嶄綔鎴愬姛", WorkflowUtils.getBusinessStatusByTaskId(taskId));
+ @GetMapping("/getTaskById/{taskId}")
+ public R<TaskVo> getTaskById(@PathVariable String taskId) {
+ return R.ok(QueryUtils.getTask(taskId));
}
@@ -243,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