From 9b3b652cfb16b09a6f9c79c5d1d8f7b2b855f22e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 二月 2025 13:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 80385fa..6ac5ced 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -409,7 +409,10 @@
                     }
                 }
             }
-
+            // 妫�鏌ユ槸鍚︽寕璧�
+            if (processLogService.taskIsHangup(task.getId(), task.getProcessInstanceId())) {
+                taskVO.setTaskStatus(TaskStatusEnum.HANGUP);
+            }
             this.distinctVo(taskVO);
             vos.add(taskVO);
         }
@@ -755,6 +758,10 @@
         for (Task task : taskList) {
             CustomerTaskVO taskVO = new CustomerTaskVO();
             this.setRuntimeTaskInfo(task, taskVO, projectId);
+            // 妫�鏌ユ槸鍚︽寕璧�
+            if (processLogService.taskIsHangup(task.getId(), task.getProcessInstanceId())) {
+                taskVO.setTaskStatus(TaskStatusEnum.HANGUP);
+            }
             vos.add(taskVO);
         }
         result.put("taskList", vos);

--
Gitblit v1.8.0