From c4574637d156f8ac2c00d9da5cb07e2e7646ac20 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 01:40:30 +0800
Subject: [PATCH] 增加个人已办列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
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 590d1c2..35394e9 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
@@ -594,29 +594,37 @@
.listPage((int)firstResult, (int)page.getSize());
List<FlowVO> records = new LinkedList<>();
- Map<String,String> processDefKeyMap = new HashMap<>();
-
+ //Map<String,String> processDefKeyMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionKey
+ //Map<String,String> processDefNameMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionName
+ Map<String,String> startUserMap = new HashMap<>();//浣跨敤userId缂撳瓨鍏跺鍚�
for(HistoricTaskInstance hisTask : processes) {
FlowVO vo = new FlowVO();
+
+
HistoricProcessInstance processInstance = historyService
.createHistoricProcessInstanceQuery()
.processInstanceId(hisTask.getProcessInstanceId())
.singleResult();
- vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+
+ if(startUserMap.containsKey(processInstance.getStartUserId())) {
+ vo.setStartUserName(startUserMap.get(processInstance.getStartUserId()));
+ }else {
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if (ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ startUserMap.put(processInstance.getStartUserId(),ru.getData().getName());
+ }
+ }
+ vo.setProcessCreateTime(processInstance.getStartTime());
+
vo.setProcessInstanceId(hisTask.getProcessInstanceId());
- //vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
-
-
+ vo.setTaskName(hisTask.getName());
+ vo.setCreateTime(hisTask.getCreateTime());
+ vo.setEndTime(hisTask.getEndTime());
vo.setVariables(hisTask.getProcessVariables());
- //vo.setTaskDefinitionKey();
- //hisTask.getCreateTime()
- Date processStartTime = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(hisTask.getProcessInstanceId())
- .singleResult()
- .getStartTime();
- vo.setProcessCreateTime(processStartTime);
+ vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(hisTask.getEndTime());
vo.setFile(getFileString(hisTask.getProcessInstanceId()));
--
Gitblit v1.9.3