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 7f99856b40..91da8d41ca 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 @@ -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("环节的办理人信息") diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java index b40437ffb3..a4d89e0032 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java +++ b/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 businessFlowRecord(String procInsId, String deployId) { - return flowTaskService.businessFlowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowTaskService.businessFlowRecord(procInsId, deployId); + return flowRecordVoResultBean; } @Override 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 75aff7d88a..bc25b6f749 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 @@ -259,10 +259,14 @@ public class FlowTaskService extends MybatisBaseService> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getAssignee());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); List data1 = sysUserVoResultBean.getData(); @@ -311,6 +315,7 @@ public class FlowTaskService extends MybatisBaseService flowRecord(String procInsId, String deployId) { - return flowableService.flowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); + return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId); } @Override diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 16cbf9761b..5060ab48ce 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/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 flowRecord(String procInsId, String deployId) { - return flowTaskFeign.businessFlowRecord(procInsId, deployId); + ResultBean flowRecordVoResultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId); + return flowRecordVoResultBean;//flowTaskFeign.businessFlowRecord(procInsId, deployId); } /**