diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java index ca15894b..6a82fb4f 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java @@ -10,6 +10,8 @@ import io.renren.common.utils.MessageUtils; import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.demanData.dto.TDemandDataDTO; import io.renren.modules.demanData.service.TDemandDataService; +import io.renren.modules.demandComment.dto.TDemandCommentDTO; +import io.renren.modules.demandComment.service.TDemandCommentService; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.resource.dto.ResourceDTO; @@ -62,6 +64,9 @@ public class ActTaskService extends BaseServiceImpl { public static String Task_HANDLE_STATE_BACK = "back"; //回退 public static String Task_HANDLE_STATE_STOP = "stop"; //终止 + @Autowired + private TDemandCommentService tDemandCommentService; + @Autowired protected TaskService taskService; @Autowired @@ -166,6 +171,16 @@ public class ActTaskService extends BaseServiceImpl { listDto.add(dto); continue; } + + TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey())); + if (tDemandCommentDTO != null) { + Map variables = oMapper.convertValue(tDemandCommentDTO, Map.class); + processVariable.putAll(variables); + processVariable.putAll(task.getProcessVariables()); + dto.setParams(processVariable); + listDto.add(dto); + continue; + } } return new PageData<>(listDto, (int) taskQuery.count()); }