diff --git a/honeycom-flow/honeycom-flow-engine/honeycom-flow-engine-biz/src/main/java/com/honeycombis/honeycom/flow/engine/controller/EngineTaskController.java b/honeycom-flow/honeycom-flow-engine/honeycom-flow-engine-biz/src/main/java/com/honeycombis/honeycom/flow/engine/controller/EngineTaskController.java index dea018e..7097225 100644 --- a/honeycom-flow/honeycom-flow-engine/honeycom-flow-engine-biz/src/main/java/com/honeycombis/honeycom/flow/engine/controller/EngineTaskController.java +++ b/honeycom-flow/honeycom-flow-engine/honeycom-flow-engine-biz/src/main/java/com/honeycombis/honeycom/flow/engine/controller/EngineTaskController.java @@ -121,6 +121,7 @@ public class EngineTaskController { taskResultDto.setCurrentTask(false); taskResultDto.setVariableAll(variableAll); taskResultDto.setProcessInstanceId(processInstanceId); + taskResultDto.setEndTime(historicTaskInstance.get().getEndTime()); return R.ok(taskResultDto); } diff --git a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-api/src/main/java/com/honeycombis/honeycom/flow/task/dto/TaskResultDto.java b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-api/src/main/java/com/honeycombis/honeycom/flow/task/dto/TaskResultDto.java index 9d84a84..442fc32 100644 --- a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-api/src/main/java/com/honeycombis/honeycom/flow/task/dto/TaskResultDto.java +++ b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-api/src/main/java/com/honeycombis/honeycom/flow/task/dto/TaskResultDto.java @@ -1,7 +1,9 @@ package com.honeycombis.honeycom.flow.task.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; import java.util.Map; /** @@ -42,4 +44,10 @@ public class TaskResultDto { */ private Map variableAll; + /* + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + } diff --git a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/TaskServiceImpl.java b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/TaskServiceImpl.java index a452520..77d2a83 100644 --- a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/TaskServiceImpl.java +++ b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/TaskServiceImpl.java @@ -205,6 +205,7 @@ public class TaskServiceImpl implements ITaskService { .set("delegateAgain", taskResultDto.getDelegate()) .set("delegationTask", StrUtil.equals(taskResultDto.getDelegationState(), "PENDING")) + .set("endTime", taskResultDto.getEndTime()) .set("formItems", formItemVOList); if(node !=null){ // set.set("currentNodeId",node.getId());