diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index ba73c851..fa78e263 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -10,6 +10,8 @@ import io.renren.modules.activiti.service.ActHistoryService; import io.renren.modules.activiti.service.ActivitiService; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.service.TAbilityApplicationService; +import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO; +import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.service.SysUserService; import io.swagger.annotations.Api; @@ -46,6 +48,8 @@ public class HistoryController { @Autowired private TAbilityApplicationService abilityApplicationService; + @Autowired + private TResourceMountApplyService tResourceMountApplyService; @GetMapping("getInstImage") @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream") @@ -120,8 +124,11 @@ public class HistoryController { } TAbilityApplicationDTO abilityApplicationDTO = abilityApplicationService.get(Long.valueOf(activityDTO.getBusinessKey())); + TResourceMountApplyDTO tResourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(activityDTO.getBusinessKey())); if (abilityApplicationDTO != null) { activityDTO.setResourceName(abilityApplicationDTO.getSystem()); + } else if (tResourceMountApplyDTO != null) { + activityDTO.setResourceName(tResourceMountApplyDTO.getResourceDTO().getName()); } } return new Result().ok(page); 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 3812f84a..b3abfd8d 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 @@ -8,8 +8,8 @@ import io.renren.common.page.PageData; import io.renren.common.service.impl.BaseServiceImpl; import io.renren.common.utils.MessageUtils; import io.renren.modules.activiti.dto.TaskDTO; -import io.renren.modules.demandComment.dto.TDemandCommentDTO; -import io.renren.modules.demandComment.service.TDemandCommentService; +import io.renren.modules.demanData.dto.TDemandDataDTO; +import io.renren.modules.demanData.service.TDemandDataService; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO; @@ -71,7 +71,7 @@ public class ActTaskService extends BaseServiceImpl { private TResourceMountApplyService tResourceMountApplyService; @Autowired - private TDemandCommentService tDemandCommentService; + private TDemandDataService tDemandDataService; /** * 根据参数获取当前运行的任务信息 @@ -118,7 +118,7 @@ public class ActTaskService extends BaseServiceImpl { TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.get(Long.valueOf(dto.getBusinessKey())); TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey())); - TDemandCommentDTO demandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey())); + TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey())); if (abilityApplicationDTO != null) { ObjectMapper oMapper = new ObjectMapper(); Map variables = oMapper.convertValue(abilityApplicationDTO, Map.class); @@ -127,9 +127,9 @@ public class ActTaskService extends BaseServiceImpl { ObjectMapper oMapper = new ObjectMapper(); Map variables = oMapper.convertValue(resourceMountApplyDTO, Map.class); dto.setParams(variables); - } else if (demandCommentDTO != null) { + } else if (tDemandDataDTO != null) { ObjectMapper oMapper = new ObjectMapper(); - Map variables = oMapper.convertValue(demandCommentDTO, Map.class); + Map variables = oMapper.convertValue(tDemandDataDTO, Map.class); dto.setParams(variables); }