From 839919c37a00a55bc57b21bcf519a113fcbd37ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 17:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/task/FlowableTask.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java
index 94a3ef8..37bc466 100644
--- a/business/src/main/java/com/ycl/task/FlowableTask.java
+++ b/business/src/main/java/com/ycl/task/FlowableTask.java
@@ -44,6 +44,7 @@
private ProcessLogService processLogService;
@Autowired
private ProcessLogMapper processLogMapper;
+
/**
* 璧嬬爜浠诲姟
* 涓や釜閫昏緫 鏀归」鐩爜銆佹敼鑺傜偣棰滆壊
@@ -111,17 +112,16 @@
durationTime = subNodeHangupTime(hangupLogMap, task, durationTime);
String status = GREEN; // 榛樿鐘舵�佷负缁胯壊
- if (redTime != null && redTime !=0 && durationTime >= redTime) {
+ if (redTime != null && redTime != 0 && durationTime >= redTime) {
status = RED; // 濡傛灉瓒呰繃绾㈣壊鏃堕棿闃堝�硷紝鍒欑姸鎬佷负绾㈣壊
- } else if (yellowTime != null && yellowTime !=0 && durationTime >= yellowTime) {
+ } else if (yellowTime != null && yellowTime != 0 && durationTime >= yellowTime) {
status = YELLOW; // 鍚﹀垯锛屽鏋滆秴杩囬粍鑹叉椂闂撮槇鍊硷紝鍒欑姸鎬佷负榛勮壊
}
//澶勭悊鍔炵悊鏈熼檺
String overtimeStatus = NORMAL;
- if (overtime != null && overtime !=0 && durationTime >= overtime) {
+ if (overtime != null && overtime != 0 && durationTime >= overtime) {
overtimeStatus = OVERTIME; // 濡傛灉瓒呰繃鍔炵悊鏈熼檺
- }
- else if (overtime != null && overtime != 0 && durationTime >= (overtime - 12 * 60 * 60)) {
+ } else if (overtime != null && overtime != 0 && durationTime >= (overtime - 12 * 60 * 60)) {
overtimeStatus = WILLOVERTIME; // 濡傛灉涓存湡(鍥哄畾瓒呮椂鍓�12灏忔椂涓轰复鏈�)
}
// else if (overtime != null && overtime != 0 && durationDay >= (overtime - 60)) {
@@ -130,9 +130,10 @@
map.get(status).add(task.getProcessInstanceId());
processCoding.setStatus(status);
processCoding.setOvertimeStatus(overtimeStatus);
+ processCoding.setStartTaskTime(task.getCreateTime());
list.add(processCoding);
} catch (Exception e) {
- log.error(e.getMessage(),"璧嬬爜鏃堕棿鏍煎紡鏈夎");
+ log.error(e.getMessage(), "璧嬬爜鏃堕棿鏍煎紡鏈夎");
}
}
//鏇存柊椤圭洰鐮�
--
Gitblit v1.8.0