From 4d718c88dde0b0fa1cf9cf636bd05984c45b0816 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Fri, 10 Feb 2023 16:18:41 +0800
Subject: [PATCH] =?UTF-8?q?flowable=20=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/api/flowtask/FlowTask.java  | 10 +++++-----
 .../anrui/flowable/biz/flowtask/FlowTaskService.java   |  6 ++++--
 .../java/com/yxt/anrui/portal/api/flow/FlowTask.java   |  8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java
index 11ed8aba26..5065b7e241 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java
@@ -90,16 +90,16 @@ public class FlowTask extends BaseEntity implements Serializable {
     @ApiModelProperty("候选执行人")
     private String candidate;
 
-    @ApiModelProperty("任务创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date createTime;
+   /* @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    private String createTime;*/
 
     @ApiModelProperty("任务完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date finishTime;
 
     @ApiModelProperty("流程完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
     private String processEndTime;
 
     @ApiModelProperty("环节的办理人信息")
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index b6ae309c62..74721b3bf1 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -313,7 +313,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     Date startTime = histIns.getStartTime();
                     flowTask.setCreateTime(startTime);
                     Date endTime = histIns.getEndTime();
-                    flowTask.setFinishTime(endTime);
+                    if(endTime!=null){
+                        flowTask.setFinishTime(endTime);
+                    }
                     //processInstance.get("END_TIME_") timestap类型不能转string
                     String end_time_ = processInstance.get("END_TIME_") == null ? "" : "end";
                     flowTask.setProcessEndTime(end_time_);
@@ -369,7 +371,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             flowRecordVo.setFlowList(hisFlowList);
         }
-        
+        log.info("flowRecordVo:{}",JSONObject.toJSONString(flowRecordVo));
         return rb.success().setData(flowRecordVo);
     }
 
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTask.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTask.java
index d77279201b..4a3bb1c72c 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTask.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTask.java
@@ -89,12 +89,12 @@ public class FlowTask extends BaseEntity implements Serializable {
     @ApiModelProperty("候选执行人")
     private String candidate;
 
-    @ApiModelProperty("任务创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+   /* @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    private Date createTime;*/
 
     @ApiModelProperty("任务完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date finishTime;
 
     @ApiModelProperty("环节的办理人信息")