From ac07f8eb085374d43777eacb144d2660b5445e26 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:53:27 +0800
Subject: [PATCH] 处理Vo,Dto继承entity问题

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
index 87d6252..f9c658f 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
@@ -18,8 +18,12 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <resultMap id="gdSupplyDemandAuditVOResultMap" type="org.sxkj.gd.orderdata.vo.GdSupplyDemandAuditVO" extends="gdSupplyDemandAuditResultMap">
+        <result column="user_name" property="userName"/>
+    </resultMap>
 
-    <select id="selectGdSupplyDemandAuditPage" resultMap="gdSupplyDemandAuditResultMap">
+
+    <select id="selectGdSupplyDemandAuditPage" resultMap="gdSupplyDemandAuditVOResultMap">
         select * from ja_gd_supply_demand_audit where is_deleted = 0
     </select>
 
@@ -41,14 +45,17 @@
         )
     </insert>
 
-    <select id="selectSupplyDemandAuditList" resultMap="gdSupplyDemandAuditResultMap">
-        select * from ja_gd_supply_demand_audit
+    <select id="selectSupplyDemandAuditList" resultMap="gdSupplyDemandAuditVOResultMap">
+        select a.*, u.name as user_name
+        from ja_gd_supply_demand_audit a
+        left join blade_user u on a.create_user = u.id
         <where>
-            is_deleted = 0
+            a.is_deleted = 0
             <if test="demandId != null">
-                AND demand_id = #{demandId}
+                AND a.demand_id = #{demandId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 

--
Gitblit v1.9.3