From 07adf67dfc6f9f6b9bc4d8443c4a7660c19c91a5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 31 五月 2024 10:18:07 +0800
Subject: [PATCH] fix 修复 update sql缺少字段问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 91 +++++++++++++++------------------------------
1 files changed, 30 insertions(+), 61 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index a0da21d..3e20d74 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
@@ -75,8 +76,8 @@
private final IActHiProcinstService actHiProcinstService;
private final ManagementService managementService;
private final FlowEventStrategy flowEventStrategy;
- private final IWfTaskBackNodeService iWfTaskBackNodeService;
- private final IWfNodeConfigService iWfNodeConfigService;
+ private final IWfTaskBackNodeService wfTaskBackNodeService;
+ private final IWfNodeConfigService wfNodeConfigService;
@Value("${flowable.activity-font-name}")
private String activityFontName;
@@ -121,7 +122,7 @@
}
if (CollUtil.isNotEmpty(list)) {
List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
- List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
for (ProcessInstanceVo processInstanceVo : list) {
if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
@@ -168,7 +169,7 @@
}
if (CollUtil.isNotEmpty(list)) {
List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
- List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
for (ProcessInstanceVo processInstanceVo : list) {
if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
@@ -300,7 +301,6 @@
for (HistoricTaskInstance historicTaskInstance : list) {
ActHistoryInfoVo actHistoryInfoVo = new ActHistoryInfoVo();
BeanUtils.copyProperties(historicTaskInstance, actHistoryInfoVo);
- actHistoryInfoVo.setAssignee(StringUtils.isNotBlank(historicTaskInstance.getAssignee()) ? Long.valueOf(historicTaskInstance.getAssignee()) : null);
actHistoryInfoVo.setStatus(actHistoryInfoVo.getEndTime() == null ? "寰呭鐞�" : "宸插鐞�");
if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) {
actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis()));
@@ -318,6 +318,12 @@
historyInfoVo.setStartTime(e.getStartTime());
historyInfoVo.setEndTime(null);
historyInfoVo.setRunDuration(null);
+ if (ObjectUtil.isEmpty(e.getAssignee())) {
+ ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(e.getId());
+ if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
+ historyInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
+ }
+ }
});
historyInfoVoList.add(historyInfoVo);
}
@@ -330,8 +336,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
*/
@Override
- public Map<String, Object> getHistoryRecord(String processInstanceId) {
- Map<String, Object> map = new HashMap<>();
+ public List<ActHistoryInfoVo> getHistoryRecord(String processInstanceId) {
// 鏌ヨ浠诲姟鍔炵悊璁板綍
List<HistoricTaskInstance> list = QueryUtils.hisTaskInstanceQuery(processInstanceId).orderByHistoricTaskInstanceEndTime().desc().list();
list = StreamUtils.sorted(list, Comparator.comparing(HistoricTaskInstance::getEndTime, Comparator.nullsFirst(Date::compareTo)).reversed());
@@ -356,11 +361,6 @@
if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) {
actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis()));
}
- try {
- actHistoryInfoVo.setAssignee(StringUtils.isNotBlank(historicTaskInstance.getAssignee()) ? Long.valueOf(historicTaskInstance.getAssignee()) : null);
- } catch (NumberFormatException ignored) {
- log.warn("褰撳墠浠诲姟銆恵}銆�,鍔炵悊浜鸿浆鎹汉鍛業D銆恵}銆戝紓甯革紒", historicTaskInstance.getName(), historicTaskInstance.getAssignee());
- }
//闄勪欢
if (CollUtil.isNotEmpty(attachmentList)) {
List<Attachment> attachments = attachmentList.stream().filter(e -> e.getTaskId().equals(historicTaskInstance.getId())).collect(Collectors.toList());
@@ -368,25 +368,19 @@
actHistoryInfoVo.setAttachmentList(attachments);
}
}
+ //璁剧疆浜哄憳id
+ if (ObjectUtil.isEmpty(historicTaskInstance.getAssignee())) {
+ ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(historicTaskInstance.getId());
+ if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
+ actHistoryInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
+ }
+ }
actHistoryInfoVoList.add(actHistoryInfoVo);
}
- List<ActHistoryInfoVo> collect = new ArrayList<>();
- // 寰呭姙鐞�
- List<ActHistoryInfoVo> waitingTask = StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() == null);
- // 宸插姙鐞�
- List<ActHistoryInfoVo> finishTask = StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() != null);
- collect.addAll(waitingTask);
- collect.addAll(finishTask);
// 瀹℃壒璁板綍
- map.put("historyRecordList", collect);
- List<ActHistoryInfoVo> nodeInfoList = new ArrayList<>();
Map<String, List<ActHistoryInfoVo>> groupByKey = StreamUtils.groupByKey(actHistoryInfoVoList, ActHistoryInfoVo::getTaskDefinitionKey);
for (Map.Entry<String, List<ActHistoryInfoVo>> entry : groupByKey.entrySet()) {
ActHistoryInfoVo actHistoryInfoVo = BeanUtil.toBean(entry.getValue().get(0), ActHistoryInfoVo.class);
- String nickName = entry.getValue().stream().filter(e -> StringUtils.isNotBlank(e.getNickName()) && e.getEndTime() == null).map(ActHistoryInfoVo::getNickName).toList().stream().distinct().collect(Collectors.joining(StringUtils.SEPARATOR));
- if (StringUtils.isNotBlank(nickName)) {
- actHistoryInfoVo.setNickName(nickName);
- }
actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey()) && e.getEndTime() != null).findFirst()
.ifPresent(e -> {
actHistoryInfoVo.setStatus("宸插鐞�");
@@ -399,39 +393,14 @@
actHistoryInfoVo.setEndTime(null);
actHistoryInfoVo.setRunDuration(null);
});
- nodeInfoList.add(actHistoryInfoVo);
}
- // 鑺傜偣淇℃伅
- map.put("nodeListInfo", nodeInfoList);
- BpmnModel bpmnModel = repositoryService.getBpmnModel(list.get(0).getProcessDefinitionId());
- List<GraphicInfoVo> graphicInfoVos = new ArrayList<>();
- Collection<FlowElement> flowElements = bpmnModel.getMainProcess().getFlowElements();
- //鑺傜偣鍥惧舰淇℃伅
- buildGraphicInfo(flowElements, graphicInfoVos, bpmnModel);
- map.put("graphicInfoVos", graphicInfoVos);
- return map;
- }
+ List<ActHistoryInfoVo> recordList = new ArrayList<>();
+ // 寰呭姙鐞�
+ recordList.addAll(StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() == null));
+ // 宸插姙鐞�
+ recordList.addAll(StreamUtils.filter(actHistoryInfoVoList, e -> e.getEndTime() != null));
- /**
- * 鏋勫缓鑺傜偣鍥惧舰淇℃伅
- *
- * @param flowElements 鑺傜偣
- */
- private static void buildGraphicInfo(Collection<FlowElement> flowElements, List<GraphicInfoVo> graphicInfoVos, BpmnModel bpmnModel) {
- for (FlowElement flowElement : flowElements) {
- if (flowElement instanceof SubProcess) {
- Collection<FlowElement> subFlowElements = ((SubProcess) flowElement).getFlowElements();
- buildGraphicInfo(subFlowElements, graphicInfoVos, bpmnModel);
- } else {
- if (flowElement instanceof UserTask) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowElement.getId());
- GraphicInfoVo graphicInfoVo = BeanUtil.toBean(graphicInfo, GraphicInfoVo.class);
- graphicInfoVo.setNodeId(flowElement.getId());
- graphicInfoVo.setNodeName(flowElement.getName());
- graphicInfoVos.add(graphicInfoVo);
- }
- }
- }
+ return recordList;
}
/**
@@ -519,7 +488,7 @@
if (ObjectUtil.isNotEmpty(historicProcessInstanceList)) {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
}
- iWfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -554,7 +523,7 @@
if (ObjectUtil.isNotEmpty(historicProcessInstanceList)) {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
}
- iWfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -572,7 +541,7 @@
public boolean deleteFinishAndHisInstance(List<String> processInstanceIds) {
try {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
- iWfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -603,7 +572,7 @@
taskService.setAssignee(task.getId(), null);
taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "锛氭挙閿�鐢宠");
}
- HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
+ HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
List<String> nodeIds = StreamUtils.toList(taskList, Task::getTaskDefinitionKey);
runtimeService.createChangeActivityStateBuilder()
.processInstanceId(processInstanceId)
@@ -673,7 +642,7 @@
}
if (CollUtil.isNotEmpty(list)) {
List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
- List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
for (ProcessInstanceVo processInstanceVo : list) {
if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
--
Gitblit v1.9.3