From fdd02ce546bc7e312e469e62d3473d9517a8a961 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:22:15 +0800
Subject: [PATCH] 同步获取吉安机巢无人机设备
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
index bd481aa..59f748f 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
@@ -29,10 +29,18 @@
<select id="selectGdDataObjectionPage" resultMap="gdDataObjectionResultMap">
- select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names
- from ja_gd_data_objection do
- left join ja_gd_data_objection_attachment da on do.id = da.objection_id
+ select
+ do.*,
+ GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names,
+ bd.dept_name as create_dept_name
+ from
+ ja_gd_data_objection do
+ left join
+ ja_gd_data_objection_attachment da
+ on do.id = da.objection_id
+ left join blade_dept bd on bd.id = do.create_dept
<where>
+ do.is_deleted = 0
<if test="param2.title != null and param2.title != ''">
and do.title like concat('%',#{param2.title},'%')
</if>
@@ -49,7 +57,7 @@
</select>
<select id="getDetail" resultType="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
- select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names
+ select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names ,GROUP_CONCAT(da.attach_id SEPARATOR ',') as attach_ids
from ja_gd_data_objection do
left join ja_gd_data_objection_attachment da on do.id = da.objection_id
<where>
--
Gitblit v1.9.3