diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java index c889adf1..62c908d7 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java @@ -39,6 +39,8 @@ public class ProcessInstanceDTO { @ApiModelProperty(value = "实例名称") private String name; + @ApiModelProperty(value = "资源id") + private String resourceId; @ApiModelProperty(value = "描述") private String description; diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java index c3d3aa2c..f8e5c1ad 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java @@ -251,10 +251,12 @@ public class ActHistoryService { TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.getByInstanceId(dto.getProcessInstanceId()); // 获取申请表单 if (abilityApplicationDTO != null && StringUtils.isNotEmpty(abilityApplicationDTO.getSystem()) && StringUtils.isEmpty(dto.getName())) { dto.setName(abilityApplicationDTO.getSystem()); + dto.setResourceId(abilityApplicationDTO.getResourceId()); } else { TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey()); if (abilityApplicationDTO1 != null) { dto.setName(abilityApplicationDTO1.getSystem()); + dto.setResourceId(abilityApplicationDTO.getResourceId()); } } if (dto.isEnded()) { // 已结束