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/workorder/mapper/GdTaskResultMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
index 16057ad..b223923 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
@@ -75,6 +75,9 @@
         <if test="gdTaskResult.createUser != null">
             AND tr.create_user = #{gdTaskResult.createUser}
         </if>
+        <if test="gdTaskResult.attachmentType != null">
+            AND tr.attachment_type = #{gdTaskResult.attachmentType}
+        </if>
         ORDER BY tr.create_time DESC
     </select>
 
@@ -101,6 +104,12 @@
         WHERE
             tr.is_deleted = 0
           AND tr.patrol_task_id = #{patrolTaskId}
+          <if test="attachmentTypes != null and attachmentTypes.size() > 0">
+          AND tr.attachment_type IN
+          <foreach collection="attachmentTypes" item="type" open="(" separator="," close=")">
+              #{type}
+          </foreach>
+          </if>
     </select>
 
 
@@ -133,14 +142,14 @@
             patrol_task_id, result_code, result_url, shoot_time,
             photo_data, longitude, latitude, distribute_status, area_code,
             create_user, create_dept, create_time, update_user, update_time,
-            status, is_deleted
+            status, is_deleted, attachment_type, geojson
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
                 #{item.patrolTaskId}, #{item.resultCode}, #{item.resultUrl}, #{item.shootTime},
                 CASE WHEN #{item.photoData} IS NULL THEN NULL ELSE CAST(#{item.photoData} AS JSONB) END, #{item.longitude}, #{item.latitude}, #{item.distributeStatus}, #{item.areaCode},
                 #{item.createUser}, #{item.createDept}, #{item.createTime}, #{item.updateUser}, #{item.updateTime},
-                #{item.status}, #{item.isDeleted}
+                #{item.status}, #{item.isDeleted}, #{item.attachmentType}, #{item.geojson}
             )
         </foreach>
     </insert>

--
Gitblit v1.9.3