|
|
@ -454,7 +454,6 @@ public class ProcessService { |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* recursive delete all task instance by process instance id |
|
|
|
* recursive delete all task instance by process instance id |
|
|
|
* @param processInstanceId |
|
|
|
|
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void deleteWorkTaskInstanceByProcessInstanceId(int processInstanceId) { |
|
|
|
public void deleteWorkTaskInstanceByProcessInstanceId(int processInstanceId) { |
|
|
|
List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId); |
|
|
|
List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId); |
|
|
@ -1337,6 +1336,9 @@ public class ProcessService { |
|
|
|
taskInstance.setExecutorId(processInstance.getExecutorId()); |
|
|
|
taskInstance.setExecutorId(processInstance.getExecutorId()); |
|
|
|
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority()); |
|
|
|
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority()); |
|
|
|
taskInstance.setState(getSubmitTaskState(taskInstance, processInstanceState)); |
|
|
|
taskInstance.setState(getSubmitTaskState(taskInstance, processInstanceState)); |
|
|
|
|
|
|
|
if (taskInstance.getSubmitTime() == null) { |
|
|
|
|
|
|
|
taskInstance.setSubmitTime(new Date()); |
|
|
|
|
|
|
|
} |
|
|
|
if (taskInstance.getFirstSubmitTime() == null) { |
|
|
|
if (taskInstance.getFirstSubmitTime() == null) { |
|
|
|
taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime()); |
|
|
|
taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime()); |
|
|
|
} |
|
|
|
} |
|
|
@ -1745,7 +1747,6 @@ public class ProcessService { |
|
|
|
* @param endTime endTime |
|
|
|
* @param endTime endTime |
|
|
|
* @param taskInstId taskInstId |
|
|
|
* @param taskInstId taskInstId |
|
|
|
* @param varPool varPool |
|
|
|
* @param varPool varPool |
|
|
|
* @return |
|
|
|
|
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public boolean changeTaskState(TaskInstance taskInstance, ExecutionStatus state, |
|
|
|
public boolean changeTaskState(TaskInstance taskInstance, ExecutionStatus state, |
|
|
|
Date endTime, |
|
|
|
Date endTime, |
|
|
|