From 4d21104623d50e088c171d7c25815637368f717a Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 22 Apr 2022 18:07:43 +0800
Subject: [PATCH] ...

---
 .../modules/activiti/controller/HistoryController.java | 10 ++++++++++
 .../modules/activiti/dto/ProcessActivityDTO.java       |  3 +++
 2 files changed, 13 insertions(+)

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 bea98aab..ba73c851 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
@@ -8,6 +8,8 @@ import io.renren.modules.activiti.dto.ProcessActivityDTO;
 import io.renren.modules.activiti.dto.ProcessInstanceDTO;
 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.sys.dto.SysUserDTO;
 import io.renren.modules.sys.service.SysUserService;
 import io.swagger.annotations.Api;
@@ -42,6 +44,9 @@ public class HistoryController {
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    private TAbilityApplicationService abilityApplicationService;
+
     @GetMapping("getInstImage")
     @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream")
     @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType = "String")
@@ -113,6 +118,11 @@ public class HistoryController {
                 SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));
                 activityDTO.setAssigneeName(userDTO != null ? userDTO.getRealName() : "");
             }
+            TAbilityApplicationDTO abilityApplicationDTO =
+                    abilityApplicationService.get(Long.valueOf(activityDTO.getBusinessKey()));
+            if (abilityApplicationDTO != null) {
+                activityDTO.setResourceName(abilityApplicationDTO.getSystem());
+            }
         }
         return new Result().ok(page);
     }
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessActivityDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessActivityDTO.java
index 1a372b2a..4b316c89 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessActivityDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessActivityDTO.java
@@ -47,4 +47,7 @@ public class ProcessActivityDTO {
     @ApiModelProperty(value = "受理人姓名")
     private String assigneeName;
 
+    @ApiModelProperty(value = "申请资源名称")
+    private String resourceName;
+
 }