fix:任务增加结束时间
This commit is contained in:
@@ -121,6 +121,7 @@ public class EngineTaskController {
|
|||||||
taskResultDto.setCurrentTask(false);
|
taskResultDto.setCurrentTask(false);
|
||||||
taskResultDto.setVariableAll(variableAll);
|
taskResultDto.setVariableAll(variableAll);
|
||||||
taskResultDto.setProcessInstanceId(processInstanceId);
|
taskResultDto.setProcessInstanceId(processInstanceId);
|
||||||
|
taskResultDto.setEndTime(historicTaskInstance.get().getEndTime());
|
||||||
|
|
||||||
return R.ok(taskResultDto);
|
return R.ok(taskResultDto);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
package com.honeycombis.honeycom.flow.task.dto;
|
package com.honeycombis.honeycom.flow.task.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -42,4 +44,10 @@ public class TaskResultDto {
|
|||||||
*/
|
*/
|
||||||
private Map<String, Object> variableAll;
|
private Map<String, Object> variableAll;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 结束时间
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date endTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -205,6 +205,7 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
.set("delegateAgain", taskResultDto.getDelegate())
|
.set("delegateAgain", taskResultDto.getDelegate())
|
||||||
.set("delegationTask", StrUtil.equals(taskResultDto.getDelegationState(), "PENDING"))
|
.set("delegationTask", StrUtil.equals(taskResultDto.getDelegationState(), "PENDING"))
|
||||||
|
|
||||||
|
.set("endTime", taskResultDto.getEndTime())
|
||||||
.set("formItems", formItemVOList);
|
.set("formItems", formItemVOList);
|
||||||
if(node !=null){
|
if(node !=null){
|
||||||
// set.set("currentNodeId",node.getId());
|
// set.set("currentNodeId",node.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user