|
@@ -124,16 +124,16 @@ public interface BpmTaskConvert {
|
|
}
|
|
}
|
|
|
|
|
|
default BpmTaskRespVO buildTodoTask(Task todoTask, List<Task> childrenTasks,
|
|
default BpmTaskRespVO buildTodoTask(Task todoTask, List<Task> childrenTasks,
|
|
- Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting,
|
|
|
|
- BpmFormDO taskForm) {
|
|
|
|
|
|
+ Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting,
|
|
|
|
+ BpmFormDO form) {
|
|
BpmTaskRespVO bpmTaskRespVO = BeanUtils.toBean(todoTask, BpmTaskRespVO.class)
|
|
BpmTaskRespVO bpmTaskRespVO = BeanUtils.toBean(todoTask, BpmTaskRespVO.class)
|
|
.setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask))
|
|
.setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask))
|
|
.setButtonsSetting(buttonsSetting)
|
|
.setButtonsSetting(buttonsSetting)
|
|
.setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class)
|
|
.setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class)
|
|
.setStatus(FlowableUtils.getTaskStatus(childTask))));
|
|
.setStatus(FlowableUtils.getTaskStatus(childTask))));
|
|
- if (taskForm != null) {
|
|
|
|
- bpmTaskRespVO.setFormId(taskForm.getId()).setFormName(taskForm.getName())
|
|
|
|
- .setFormConf(taskForm.getConf()).setFormFields(taskForm.getFields());
|
|
|
|
|
|
+ if (form != null) {
|
|
|
|
+ bpmTaskRespVO.setFormId(form.getId()).setFormName(form.getName())
|
|
|
|
+ .setFormConf(form.getConf()).setFormFields(form.getFields());
|
|
}
|
|
}
|
|
return bpmTaskRespVO;
|
|
return bpmTaskRespVO;
|
|
}
|
|
}
|