代码提交

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;
 }
 

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;

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"/>
+        SELECT
-        where instance_id = #{instanceId}
+            bar.id,
-        order by node_order asc, approve_time asc
+            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">