From 7941db00ace2a95cf5d65b51d7ad600c225b2eda Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 7de7022..c77890f 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,15 +29,31 @@
<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 and da.is_deleted = 0
+ left join
+ blade_dept bd on bd.id = do.create_dept
<where>
+ do.is_deleted = 0
+ and da.is_deleted = 0
<if test="param2.title != null and param2.title != ''">
and do.title like concat('%',#{param2.title},'%')
</if>
<if test="param2.objectionStatus != null and param2.objectionStatus != ''">
and do.objection_status = #{param2.objectionStatus}
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and do.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
group by do.id
@@ -49,10 +65,16 @@
</select>
<select id="getDetail" resultType="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
- 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
+ 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>
+ and da.is_deleted = 0
<if test="id != null ">
and do.id = #{id}
</if>
--
Gitblit v1.9.3