From 4d83c1fe394defc2ca1b049e92633f13ffa8b89e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 10:44:36 +0800
Subject: [PATCH] 数据异议改造
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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..7a7dbbd 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,18 +29,40 @@
<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
+ obj.*,
+ string_agg(da.attach_name, ',') as attach_names,
+ bd.dept_name as create_dept_name
+ from
+ ja_gd_data_objection obj
+ left join
+ ja_gd_data_objection_attachment da
+ on obj.id = da.objection_id and da.is_deleted = 0
+ left join
+ blade_dept bd on bd.id = obj.create_dept
<where>
+ obj.is_deleted = 0
+ and da.is_deleted = 0
<if test="param2.title != null and param2.title != ''">
- and do.title like concat('%',#{param2.title},'%')
+ and obj.title like concat('%',#{param2.title},'%')
</if>
<if test="param2.objectionStatus != null and param2.objectionStatus != ''">
- and do.objection_status = #{param2.objectionStatus}
+ and obj.objection_status = #{param2.objectionStatus}
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and (
+ obj.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ )
+ or obj.apply_target_dept_id in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
- group by do.id
+ group by obj.id, bd.dept_name
</select>
@@ -49,15 +71,21 @@
</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
+ obj.*,
+ string_agg(da.attach_name, ',') as attach_names ,
+ string_agg(da.attach_id::text, ',') as attach_ids
+ from
+ ja_gd_data_objection obj
+ left join
+ ja_gd_data_objection_attachment da on obj.id = da.objection_id
<where>
+ and da.is_deleted = 0
<if test="id != null ">
- and do.id = #{id}
+ and obj.id = #{id}
</if>
</where>
- group by do.id
+ group by obj.id
</select>
</mapper>
--
Gitblit v1.9.3