From 8bb52031470caf07ab8b8d2ed2cd5129c819ddfa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index 0c2d7a4..d1e99b7 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -1336,6 +1336,8 @@
if (StringUtils.isBlank(s.getDeleteReason())) {
flowViewerList.add(flowViewerDto);
}
+ flowViewerDto.setHasJump(processLogService.taskIsJump(s.getTaskId(), procInsId));
+ flowViewerDto.setHasWait(processLogService.taskIsWait(s.getTaskId(), procInsId));
});
// 鑾峰彇浠ｅ姙鑺傜偣
@@ -1353,8 +1355,10 @@
// 鎵╁睍鍐呭 浠ｅ姙鐨勯�氳繃褰撳墠鏃堕棿浣滀负endTime
ProcessCoding processCoding = processCodingMap.get(s.getTaskId());
//濡傛灉鏈夌洃鎺ф暟鎹� 涓嶅弽鐨勮瘽鍓嶇榛樿鏄繘琛屼腑(钃濊壊)
- if (processCoding != null && (RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus()))) {
- flowViewerDto.setOvertime(processCoding.getStatus());
+ if (Objects.nonNull(processCoding)) {
+ if (RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus())) {
+ flowViewerDto.setOvertime(processCoding.getStatus());
+ }
}
flowViewerList.add(flowViewerDto);
});
--
Gitblit v1.8.0