From d40e10d05dc916dd02332758634af383c662883f Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 20 Jan 2026 11:13:49 +0800
Subject: [PATCH] 巡查任务列表返回新增成果数量和问题事件数量
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index d9706b7..faf2c0f 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdPatrolTaskMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.workorder.entity.GdPatrolTaskEntity">
+ <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
<result column="id" property="id"/>
<result column="work_order_id" property="workOrderId"/>
<result column="patrol_task_name" property="patrolTaskName"/>
@@ -22,13 +22,26 @@
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="result_count" property="resultCount"/>
+ <result column="issue_event_count" property="issueEventCount"/>
</resultMap>
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
- select pt.*, wo.work_order_name
+ select pt.*,
+ wo.work_order_name,
+ IFNULL(tr.result_count, 0) as result_count,
+ IFNULL(tr.issue_event_count, 0) as issue_event_count
from ja_gd_patrol_task pt
left join ja_gd_work_order wo on pt.work_order_id = wo.id
+ left join (
+ select patrol_task_id,
+ count(*) as result_count,
+ sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
+ from ja_gd_task_result
+ where is_deleted = 0
+ group by patrol_task_id
+ ) tr on tr.patrol_task_id = pt.id
<where>
<if test="param2.workOrderId != null and param2.workOrderId != ''">
and pt.work_order_id = #{param2.workOrderId}
--
Gitblit v1.9.3