完善流程审批记录的查询

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java

@@ -91,11 +91,11 @@ public class FlowTask extends BaseEntity implements Serializable {
     private String candidate;
 
     @ApiModelProperty("任务创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     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("环节的办理人信息")

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java

@@ -237,7 +237,8 @@ public class FlowTaskController implements FlowTaskFeign {
 
     @Override
     public ResultBean<FlowRecordVo> businessFlowRecord(String procInsId, String deployId) {
-        return flowTaskService.businessFlowRecord(procInsId, deployId);
+        ResultBean<FlowRecordVo> flowRecordVoResultBean = flowTaskService.businessFlowRecord(procInsId, deployId);
+        return flowRecordVoResultBean;
     }
 
     @Override

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -259,10 +259,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     FlowTask flowTask = new FlowTask();
                     flowTask.setTaskId(histIns.getTaskId());
                     flowTask.setTaskName(histIns.getActivityName());
+
                     Date startTime = histIns.getStartTime();
                     flowTask.setCreateTime(startTime);
                     Date endTime = histIns.getEndTime();
-                    flowTask.setFinishTime(startTime);
+                    flowTask.setFinishTime(endTime);
+/*
+                    flowTask.setCreateTime(histIns.getStartTime());
+                    flowTask.setFinishTime(histIns.getEndTime());*/
                     if (StringUtils.isNotBlank(histIns.getAssignee())) {
                         ResultBean<List<SysUserVo>> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getAssignee());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee()));
                         List<SysUserVo> data1 = sysUserVoResultBean.getData();
@@ -311,6 +315,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             flowRecordVo.setFlowList(hisFlowList);
         }
+        
         return rb.success().setData(flowRecordVo);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -132,7 +132,8 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean<FlowRecordVo> flowRecord(String procInsId, String deployId) {
-        return flowableService.flowRecord(procInsId, deployId);
+        ResultBean<FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
+        return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId);
     }
 
     @Override

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -296,7 +296,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
      * @return
      */
     public ResultBean<FlowRecordVo> flowRecord(String procInsId, String deployId) {
-        return flowTaskFeign.businessFlowRecord(procInsId, deployId);
+        ResultBean<FlowRecordVo> flowRecordVoResultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId);
+        return flowRecordVoResultBean;//flowTaskFeign.businessFlowRecord(procInsId, deployId);
     }
 
     /**