From 80a641659a361c9f55c57936daca0a1790f777d5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 12 六月 2025 22:55:06 +0800
Subject: [PATCH] 机床组改为字典
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
index ea3ebd6..2166277 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -27,18 +27,47 @@
@RequestMapping("/flow/")
@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
public class MyFlowController {
-
+ @Autowired
+ private TaskService taskService;
@Autowired
private FlowBusinessService businessService;
/**
- * 寰呭姙浜嬪姟鍒楄〃椤�
+ * 寰呭姙浠诲姟鍒楄〃椤�
*/
@GetMapping("todo-list")
@ApiOperationSupport(order = 3)
- @Operation(summary = "鎴戠殑娴佺▼", description = "浼犲叆娴佺▼淇℃伅")
+ @Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
public R<IPage<BladeFlow>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), keyword);
return R.data(pages);
}
+
+ /**
+ * 寰呭姙浠诲姟鍒楄〃椤�
+ */
+ @GetMapping("alltask-list")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "鎵�鏈変换鍔★紙fortest锛�", description = "浼犲叆娴佺▼淇℃伅")
+ public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
+ IPage<BladeFlow> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword);
+ return R.data(pages);
+ }
+
+ @Operation(summary = "杞淳浠诲姟", description = "")
+ @PostMapping("transferTask")
+ public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment, @RequestBody Map<String, Object> variables) {
+ // 澧炲姞璇勮
+ if (StringUtil.isNoneBlank(processInstanceId, comment)) {
+ taskService.addComment(taskId, processInstanceId, comment);
+ }
+ // 闈炵┖鍒ゆ柇
+ if (Func.isEmpty(variables)) {
+ variables = Kv.create();
+ }
+ // 瀹屾垚浠诲姟
+ taskService.setAssignee(taskId, newAssigneeId);
+ return R.success("娴佺▼杞淳鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3