From c950efc96ed638975226684c735d16aa81a9bae7 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 22 Jul 2022 13:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E6=B5=81=E7=A8=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B5=81=E7=A8=8B=E5=86=85=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HistoryController.java         | 25 +++++++++++++++++++
 1 file changed, 25 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 09d5765e..bc481704 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
@@ -22,6 +22,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricProcessInstanceQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +51,9 @@ import java.util.Optional;
 @RequestMapping("/act/his")
 @Api(tags = "流程历史")
 public class HistoryController {
+
+    @Autowired
+    protected HistoryService historyService_;
     @Autowired
     private ActHistoryService historyService;
     @Autowired
@@ -59,6 +68,13 @@ public class HistoryController {
     @Autowired
     private TDemandDataService tDemandDataService;
 
+    @Autowired
+    protected TaskService taskService;
+    @Autowired
+    protected RepositoryService repositoryService;
+    @Autowired
+    protected RuntimeService runtimeService;
+
     @GetMapping("getInstImage")
     @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream")
     @LogOperation("获取流程活动图")
@@ -136,6 +152,15 @@ public class HistoryController {
         return new Result().ok(page);
     }
 
+    @GetMapping("getVariablesByInstanceId")
+    @ApiOperation("获取已办任务流程参数")
+    @LogOperation("获取已办任务流程参数")
+    public Result getVariablesByInstanceId(String instanceId, String variableName) {
+        HistoricProcessInstanceQuery query = historyService_.createHistoricProcessInstanceQuery();
+        Optional<HistoricProcessInstance> processInstance = Optional.ofNullable(query.processInstanceId(instanceId).includeProcessVariables().singleResult());
+        return new Result().ok(processInstance.get().getProcessVariables().get(variableName));
+    }
+
     @GetMapping("getDeptHandledInstancePage")
     @ApiOperation("已办任务：根据登录账号查询其所在部门的已办任务")
     @LogOperation("已办任务：根据登录账号查询其所在部门的已办任务")