From fe185a5eb4669e925af908153bdf21778551fdb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 20:23:36 +0800
Subject: [PATCH] 增加固化流程文件内容比对接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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 7c5b22d..d1c55b5 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
@@ -42,6 +42,8 @@
@Autowired
private FlowTransferService flowTransferService;
+ @Autowired
+ private FlowCommonService flowCommonService;
/**
* 寰呭姙浠诲姟鍒楄〃椤�
*/
@@ -94,7 +96,8 @@
@GetMapping("flow-user-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
- public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId) {
+ public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId,String taskId) {
+ //userSearchClient.listByRole()
return userSearchClient.listByDept(deptId);
}
@@ -106,18 +109,6 @@
@ApiOperationSupport(order = 3)
@Operation(summary = "涓婁竴姝ュ鎵逛汉鏌ヨ", description = "涓婁竴姝ュ鎵逛汉鏌ヨ锛岃繑鍥炲鎵逛汉id")
public R<String> previusApproveUserId(@Parameter(description = "閮ㄩ棬ID") String processInstanceId) {
- // 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(processInstanceId)
- .orderByHistoricTaskInstanceEndTime().asc()
- .list();
-
- // 鑾峰彇涓婁竴涓凡瀹屾垚鐨勪换鍔�
- String assignee = "";
- if(historicTasks.size()>1) {
- assignee = historicTasks.get(historicTasks.size() - 2).getAssignee();
- }
- return R.data(assignee);
-
+ return R.data(this.flowCommonService.previusAssignee(processInstanceId));
}
}
--
Gitblit v1.9.3