From 8873f536b447ad1e04635f6853a0f45bca833f50 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 17 六月 2025 16:42:29 +0800
Subject: [PATCH] 增加选择用户接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 17 ++++++++++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 9 +++++++--
2 files changed, 23 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 e57a190..507da50 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
@@ -15,10 +15,14 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.feign.IUserSearchClient;
+import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -30,7 +34,8 @@
private TaskService taskService;
@Autowired
private FlowBusinessService businessService;
-
+ @Autowired
+ private IUserSearchClient userSearchClient;
/**
* 寰呭姙浠诲姟鍒楄〃椤�
*/
@@ -69,4 +74,14 @@
return R.success("娴佺▼杞淳鎴愬姛");
}
+ /**
+ * 寰呭姙浠诲姟鍒楄〃椤�
+ */
+ @GetMapping("flow-user-list")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
+ public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId) {
+ return userSearchClient.listByDept(deptId);
+
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index a6189cb..04904a4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -11,6 +11,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.*;
+import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
@@ -32,7 +33,7 @@
private final TaskService taskService;
private final HistoryService historyService;
-
+ private final MachineService machineService;
public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
//String taskUser = TaskUtil.getTaskUser();
@@ -57,7 +58,11 @@
// 鏋勫缓鍒楄〃鏁版嵁
FlowVO bladeFlow = new FlowVO();
buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO , "todo"
-
+ flowList.forEach(flowVO -> {
+ if(flowVO.getVariables().containsKey("machineCode")){
+ //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
+ }
+ });
// 璁＄畻鎬绘暟
long count = todoQuery.count();
// 璁剧疆椤垫暟
--
Gitblit v1.9.3