From ca933e56e0a43e8929a7da7156fa808f2093c92a Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Mon, 29 Dec 2025 18:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/domain/ApprovalInstance.java     |  2 +
 .../approval/domain/ApprovalRecord.java       |  1 +
 .../approval/ApprovalRecordMapper.xml         | 38 +++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java
index f8e1f43..9476934 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java
@@ -86,5 +86,7 @@ public class ApprovalInstance implements Serializable {
      */
     @ApiModelProperty("审批记录列表")
     private List<ApprovalRecord> recordList;
+
+    private String name;
 }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java
index 1dffdef..5670577 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java
@@ -44,6 +44,7 @@ public class ApprovalRecord implements Serializable {
 
     @ApiModelProperty("审批人姓名")
     private String approverName;
+    private  String name;
 
     @ApiModelProperty("审批结果（1通过 2驳回）")
     private String approveResult;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml
index fd16009..119afb6 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml
@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveOpinion" column="approve_opinion"/>
         <result property="approveTime" column="approve_time"/>
         <result property="createTime" column="create_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="name" column="name"/>
     </resultMap>
 
     <sql id="selectRecordVo">
@@ -25,9 +27,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectRecordListByInstanceId" parameterType="Long" resultMap="ApprovalRecordResult">
-        <include refid="selectRecordVo"/>
-        where instance_id = #{instanceId}
-        order by node_order asc, approve_time asc
+        SELECT
+            bar.id,
+            bar.instance_id,
+            bar.node_id,
+            bar.node_name,
+            bar.node_order,
+            bar.approver_id,
+            bar.approver_name,
+            bar.approve_result,
+            bar.approve_opinion,
+            bar.approve_time,
+            bar.create_time ,
+            -- 拼接多个人/角色名称，无匹配则返回'未配置'
+            COALESCE(
+                    CASE
+                        WHEN ban.approver_type = '1' THEN
+                            (SELECT GROUP_CONCAT(su.nick_name)
+                             FROM sys_user su
+                             WHERE FIND_IN_SET(su.user_id, ban.approver_ids))
+                        WHEN ban.approver_type = '2' THEN
+                            (SELECT GROUP_CONCAT(sr.role_name)
+                             FROM sys_role sr
+                             WHERE FIND_IN_SET(sr.role_id, ban.approver_ids))
+                        END,
+                    '未配置'
+                ) AS name
+        FROM
+            bm_approval_record bar
+                left JOIN bm_approval_node ban on bar.node_id=ban.id
+        where bar.instance_id = #{instanceId}
+        ORDER BY
+            bar.node_order ASC,
+            bar.approve_time ASC
     </select>
 
     <select id="selectRecordListByNode" resultMap="ApprovalRecordResult">