From 9978fe196d10fc7b32980c1dd2a03de5f84dc80d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 13:24:53 +0800
Subject: [PATCH] 数据异议申请

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 9fddab8..b68c7c4 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
@@ -3,7 +3,7 @@
 <mapper namespace="org.sxkj.gd.orderdata.mapper.GdDataObjectionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="gdDataObjectionResultMap" type="org.sxkj.gd.orderdata.entity.GdDataObjectionEntity">
+    <resultMap id="gdDataObjectionResultMap" type="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
         <result column="id" property="id"/>
         <result column="title" property="title"/>
         <result column="objection_type" property="objectionType"/>
@@ -17,6 +17,7 @@
         <result column="other_objection_detail" property="otherObjectionDetail"/>
         <result column="review_opinion" property="reviewOpinion"/>
         <result column="area_code" property="areaCode"/>
+        <result column="attach_names" property="attachNames"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
@@ -28,7 +29,18 @@
 
 
     <select id="selectGdDataObjectionPage" resultMap="gdDataObjectionResultMap">
-        select * from ja_gd_data_objection where is_deleted = 0
+        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
+        <where>
+            <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>
+        </where>
+        group by do.id
     </select>
 
 

--
Gitblit v1.9.3