From fdea9823bf20421428ba178a78541e4a08cdc8c8 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Thu, 2 Feb 2023 09:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E8=AE=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yxt/anrui/terminal/biz/app/AppService.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
index 0aef385141..989aae7acf 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
@@ -12,6 +12,7 @@ import com.yxt.anrui.terminal.api.app.flowable.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -78,7 +79,8 @@ public class AppService {
         List<AppFlowableRecordVo> progressList = progressdata.getData();
         progressList.forEach(f->{
             AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo();
-            a.setTime(f.getCreateTime());
+            a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime());
+           // a.setTime(f.getCreateTime());
             a.setFlowableRecordVo(f);
             a.setState(0+"");
             list.add(a);