From 2a5a028e5f5d1cbab9a0bdb26ce6c48a5184ef49 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 26 十二月 2024 18:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index 4486c01..09202bf 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -1124,12 +1124,15 @@
.processInstanceId(procInsId)
.finished()
.list();
- //鑾峰彇鎵�鏈変换鍔¤妭鐐逛俊鎭�(鎵╁睍)
- List<HistoricTaskInstance> taskList = historyService.createHistoricTaskInstanceQuery()
+ //鑾峰彇鎵�鏈夊巻鍙蹭换鍔¤妭鐐逛俊鎭�(鎵╁睍)
+ List<HistoricTaskInstance> taskHistoryList = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(procInsId)
.finished()
.list();
-
+ //鑾峰彇鎵�鏈夊綋鍓嶄换鍔¤妭鐐逛俊鎭�(鎵╁睍)
+ List<Task> taskList = taskService.createTaskQuery()
+ .processInstanceId(procInsId)
+ .list();
// 淇濆瓨宸茬粡瀹屾垚鐨勬祦绋嬭妭鐐圭紪鍙�
listFinished.forEach(s -> {
FlowViewerDto flowViewerDto = new FlowViewerDto();
@@ -1137,7 +1140,7 @@
flowViewerDto.setCompleted(true);
//鎵╁睍鍐呭 宸插畬鎴愮殑鐢ㄥ畬鎴愭椂闂村垽鏂�
Date endTime = s.getEndTime();
- for (HistoricTaskInstance task : taskList) {
+ for (HistoricTaskInstance task : taskHistoryList) {
if(s.getTaskId()!=null && s.getTaskId().equals(task.getId())){
if(task.getDueDate()!=null && endTime.after(task.getDueDate())){
flowViewerDto.setOvertime(true);
@@ -1164,7 +1167,7 @@
flowViewerDto.setKey(s.getActivityId());
flowViewerDto.setCompleted(false);
//鎵╁睍鍐呭 浠ｅ姙鐨勯�氳繃褰撳墠鏃堕棿鍘诲垽鏂�
- for (HistoricTaskInstance task : taskList) {
+ for (Task task : taskList) {
if(s.getTaskId()!=null && s.getTaskId().equals(task.getId())){
if(task.getDueDate()!=null && now.after(task.getDueDate())){
flowViewerDto.setOvertime(true);
--
Gitblit v1.8.0