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 bc481704..21a7b36a 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 @@ -14,6 +14,8 @@ 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.resource.dto.ResourceDTO; +import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO; import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.sys.dto.SysUserDTO; @@ -67,6 +69,8 @@ public class HistoryController { private TResourceMountApplyService tResourceMountApplyService; @Autowired private TDemandDataService tDemandDataService; + @Autowired + private ResourceService resourceService; @Autowired protected TaskService taskService; @@ -200,9 +204,11 @@ public class HistoryController { abilityApplicationService.getByInstanceId(activityDTO.getProcessInstanceId()); TResourceMountApplyDTO tResourceMountApplyDTO = null; TDemandDataDTO tDemandDataDTO = null; + ResourceDTO resourceDTO = null; if (!activityDTO.getBusinessKey().startsWith("[") && !activityDTO.getBusinessKey().startsWith("{")) { // json 内容(批量申请) tResourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(activityDTO.getBusinessKey())); tDemandDataDTO = tDemandDataService.get(Long.valueOf(activityDTO.getBusinessKey())); + resourceDTO = resourceService.get(Long.valueOf(activityDTO.getBusinessKey())); } if (abilityApplicationDTOS != null && !abilityApplicationDTOS.isEmpty()) { StringBuffer stringBuffer = new StringBuffer(); @@ -216,6 +222,8 @@ public class HistoryController { activityDTO.setResourceName(tResourceMountApplyDTO.getResourceDTO().getName()); } else if (tDemandDataDTO != null) { activityDTO.setResourceName(tDemandDataDTO.getDemandSubject()); + } else if (resourceDTO != null) { + activityDTO.setResourceName(resourceDTO.getName()); } } }