|
|
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
|
|
|
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmConstants;
|
|
|
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
|
|
|
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
|
|
|
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
|
|
|
@@ -46,8 +47,12 @@ public interface BpmTaskConvert {
|
|
|
default PageResult<BpmTaskRespVO> buildTodoTaskPage(PageResult<Task> pageResult,
|
|
|
Map<String, ProcessInstance> processInstanceMap,
|
|
|
Map<Long, AdminUserRespDTO> userMap,
|
|
|
- Map<String, BpmProcessDefinitionExtDO> bpmProcessDefinitionExtDOMap) {
|
|
|
+ Map<String, BpmProcessDefinitionExtDO> bpmProcessDefinitionExtDOMap,
|
|
|
+ Map<String, Task> taskMap) {
|
|
|
return BeanUtils.toBean(pageResult, BpmTaskRespVO.class, taskVO -> {
|
|
|
+ Task task = taskMap.get(taskVO.getId());
|
|
|
+ Map<String, Object> processVariables = task.getProcessVariables();
|
|
|
+ taskVO.setStatus((Integer) processVariables.get(BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS));
|
|
|
ProcessInstance processInstance = processInstanceMap.get(taskVO.getProcessInstanceId());
|
|
|
if (processInstance == null) {
|
|
|
return;
|