From 67961e8f4fdbcd83bf59f8c8bd3f8600618e3d61 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 14:26:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 0edabc8..f854a7d 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
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdTaskResultMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="gdTaskResultResultMap" type="org.sxkj.gd.workorder.entity.GdTaskResultEntity">
+ <resultMap id="gdTaskResultResultMap" type="org.sxkj.gd.workorder.vo.GdTaskResultVO">
<result column="id" property="id"/>
<result column="patrol_task_id" property="patrolTaskId"/>
<result column="result_code" property="resultCode"/>
@@ -20,6 +20,8 @@
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="distribute_user_name" property="distributeUserName"/>
+ <result column="distribute_dept_name" property="distributeDeptName"/>
</resultMap>
@@ -27,6 +29,18 @@
select * from ja_gd_task_result where is_deleted = 0
</select>
+ <select id="selectGdTaskResultListByPatrolTaskId" resultMap="gdTaskResultResultMap">
+ select tr.*,
+ IFNULL(bu.real_name, bu.name) as distribute_user_name,
+ bd.dept_name as distribute_dept_name
+ from ja_gd_task_result tr
+ left join ja_gd_clue_event ce on ce.result_id = tr.id and ce.is_deleted = 0
+ left join blade_user bu on bu.id = ce.create_user and bu.is_deleted = 0
+ left join blade_dept bd on bd.id = ce.create_dept and bd.is_deleted = 0
+ where tr.is_deleted = 0
+ and tr.patrol_task_id = #{patrolTaskId}
+ </select>
+
<select id="exportGdTaskResult" resultType="org.sxkj.gd.workorder.excel.GdTaskResultExcel">
SELECT * FROM ja_gd_task_result ${ew.customSqlSegment}
--
Gitblit v1.9.3