From 3decf2840528bd788296c5143d669da333dad527 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 22 Apr 2022 16:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=84=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/dto/HistoryDetailDTO.java        |  5 +++-
 .../activiti/entity/HistoryDetailEntity.java  |  4 ++-
 .../mapper/activiti/ProcessActivityDao.xml    | 29 ++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java
index 66051fb2..f95e03d3 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/HistoryDetailDTO.java
@@ -36,7 +36,7 @@ public class HistoryDetailDTO {
     @ApiModelProperty(value = "执行ID")
     private String executionId;
 
-    @ApiModelProperty(value = "受理人")
+    @ApiModelProperty(value = "受理人id")
     private String assignee;
 
     @ApiModelProperty(value = "开始时间")
@@ -50,4 +50,7 @@ public class HistoryDetailDTO {
 
     @ApiModelProperty(value = "审批意见")
     private String comment;
+
+    @ApiModelProperty(value = "受理人姓名")
+    private String assigneeName;
 }
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java b/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java
index 4e78910b..4716e91e 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/entity/HistoryDetailEntity.java
@@ -9,7 +9,7 @@ import java.util.Date;
  * @author Jone
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 public class HistoryDetailEntity {
     private static final long serialVersionUID = 1L;
 
@@ -37,4 +37,6 @@ public class HistoryDetailEntity {
 
     private String comment;
 
+    private String assigneeName;
+
 }
diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
index e41e4f87..4e7ef980 100644
--- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
+++ b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
@@ -56,13 +56,28 @@
     </select>
 
     <select id="getTaskHandleDetailInfo" resultMap="HistoryDetail">
-        SELECT ahc.ID_, ahc.TYPE_, aht.ID_ as TASK_ID_, aht.PROC_INST_ID_, ahc.MESSAGE_,
-        aht.PROC_DEF_ID_, aht.EXECUTION_ID_, aht.NAME_, aht.ASSIGNEE_, aht.START_TIME_,
-        aht.END_TIME_ from ACT_HI_TASKINST aht
-        left join ACT_HI_COMMENT ahc on ahc.TASK_ID_ = aht.ID_ and ahc.TYPE_ = 'comment'
-        where aht.PROC_INST_ID_ = #{processInstanceId}
-        and aht.end_time_ is not null
-        order by aht.START_TIME_ desc
+        SELECT
+        ahc.ID_,
+        ahc.TYPE_,
+        aht.ID_ AS TASK_ID_,
+        aht.PROC_INST_ID_,
+        ahc.MESSAGE_,
+        aht.PROC_DEF_ID_,
+        aht.EXECUTION_ID_,
+        aht.NAME_,
+        aht.ASSIGNEE_,
+        aht.START_TIME_,
+        aht.END_TIME_,
+        ( SELECT user1.real_name FROM sys_user user1 WHERE user1.id = aht.ASSIGNEE_ ) ASSIGNEE_NAME_
+        FROM
+        ACT_HI_TASKINST aht
+        LEFT JOIN ACT_HI_COMMENT ahc ON ahc.TASK_ID_ = aht.ID_
+        AND ahc.TYPE_ = 'comment'
+        WHERE
+        aht.PROC_INST_ID_ = #{processInstanceId}
+        AND aht.end_time_ IS NOT NULL
+        ORDER BY
+        aht.START_TIME_ DESC
     </select>
 
 </mapper>
\ No newline at end of file