From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口

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

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
index c2a85da..cedc420 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
@@ -17,8 +17,14 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <resultMap id="gdSupplyDemandAuditAttachmentVOResultMap" type="org.sxkj.gd.orderdata.vo.GdSupplyDemandAuditAttachmentVO" extends="gdSupplyDemandAuditAttachmentResultMap">
+        <result column="file_url" property="fileUrl"/>
+        <result column="file_size" property="fileSize"/>
+        <result column="file_original_name" property="fileOriginalName"/>
+    </resultMap>
 
-    <select id="selectGdSupplyDemandAuditAttachmentPage" resultMap="gdSupplyDemandAuditAttachmentResultMap">
+
+    <select id="selectGdSupplyDemandAuditAttachmentPage" resultMap="gdSupplyDemandAuditAttachmentVOResultMap">
         select * from ja_gd_supply_demand_audit_attachment where is_deleted = 0
     </select>
 
@@ -41,12 +47,18 @@
         </foreach>
     </insert>
 
-    <select id="selectSupplyDemandAuditAttachmentList" resultMap="gdSupplyDemandAuditAttachmentResultMap">
-        select * from ja_gd_supply_demand_audit_attachment
+    <select id="selectSupplyDemandAuditAttachmentList" resultMap="gdSupplyDemandAuditAttachmentVOResultMap">
+        select
+            audit_attachment.*,
+            attach.link as file_url,
+            round(attach.attach_size / 1024 / 1024, 2) as file_size,
+            attach.original_name as file_original_name
+        from ja_gd_supply_demand_audit_attachment audit_attachment
+        left join blade_attach attach on attach.id::VARCHAR = audit_attachment.attach_id::VARCHAR and attach.is_deleted = 0
         <where>
-            is_deleted = 0
+            audit_attachment.is_deleted = 0
             <if test="demandId != null">
-                AND demand_id = #{demandId}
+                AND audit_attachment.demand_id = #{demandId}
             </if>
         </where>
     </select>

--
Gitblit v1.9.3