From 6e8166012e4e5842cfdecd4d318f8f9ec6ac9f4d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 31 三月 2025 09:31:58 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java b/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
index 4be1147..8a036dd 100644
--- a/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
+++ b/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
@@ -17,6 +17,7 @@
import java.util.List;
import static com.ycl.common.constant.ProcessOverTimeConstants.GREEN;
+import static com.ycl.common.constant.ProcessOverTimeConstants.NORMAL;
/**
* 浠诲姟鐩戝惉鍣�
@@ -41,6 +42,10 @@
*/
private FixedValue 绾㈢爜鏃堕暱;
/**
+ * 鍔炵悊鏈熼檺
+ */
+ private FixedValue 鍔炵悊鏈熼檺;
+ /**
* 璁℃椂璧峰鑺傜偣瀹氫箟Id
*/
private FixedValue 寮�濮嬭鏃惰妭鐐�;
@@ -59,21 +64,27 @@
processCoding.setTaskId(taskId);
processCoding.setProcessInsId(processInstanceId);
processCoding.setTaskDefKey(delegateTask.getTaskDefinitionKey());
- //鏌ヨ鏄惁鏈夎繖涓畾涔夎妭鐐圭殑鍘嗗彶鏁版嵁锛屽彇鏈�鏅氱殑涓�鏉＄姸鎬佺爜锛岄伩鍏嶅畾鏃朵换鍔¤繕鏈墽琛岀殑璇樊
+ //璁剧疆鐘舵�侊紝鏌ヨ鏄惁鏈夎繖涓畾涔夎妭鐐圭殑鍘嗗彶鏁版嵁锛屽彇鏈�鏂扮殑涓�鏉＄姸鎬佺爜锛岄伩鍏嶅畾鏃朵换鍔¤繕鏈墽琛岀殑璇樊
List<ProcessCoding> processCodings = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>()
.eq("process_ins_id",processInstanceId)
.eq("task_def_key", delegateTask.getTaskDefinitionKey())
.orderByDesc("gmt_create"));
if(!CollectionUtils.isEmpty(processCodings)){
processCoding.setStatus(processCodings.get(0).getStatus());
+ processCoding.setOvertimeStatus(processCodings.get(0).getOvertimeStatus());
}else {
processCoding.setStatus(GREEN);
+ processCoding.setOvertimeStatus(NORMAL);
}
+
if (榛勭爜鏃堕暱 != null && 榛勭爜鏃堕暱.getValue(delegateTask) != null) {
- processCoding.setYellowTime(Integer.parseInt(榛勭爜鏃堕暱.getValue(delegateTask).toString()));
+ processCoding.setYellowTime(榛勭爜鏃堕暱.getValue(delegateTask).toString());
}
if (绾㈢爜鏃堕暱 != null && 绾㈢爜鏃堕暱.getValue(delegateTask) != null) {
- processCoding.setRedTime(Integer.parseInt(绾㈢爜鏃堕暱.getValue(delegateTask).toString()));
+ processCoding.setRedTime(绾㈢爜鏃堕暱.getValue(delegateTask).toString());
+ }
+ if (鍔炵悊鏈熼檺 != null && 鍔炵悊鏈熼檺.getValue(delegateTask) != null) {
+ processCoding.setOvertime(鍔炵悊鏈熼檺.getValue(delegateTask).toString());
}
//璁剧疆寮�濮嬭妭鐐�
if (寮�濮嬭鏃惰妭鐐� != null && 寮�濮嬭鏃惰妭鐐�.getValue(delegateTask) != null) {
--
Gitblit v1.8.0