From 7473859cd3ee464fde053435f7c2da5aab71aa9b Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 10:02:14 +0800
Subject: [PATCH] 巡查任务报告及工单事件详情根据经纬度返回详细地址
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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..baf5370 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,9 +3,10 @@
<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="work_order_name" property="workOrderName"/>
<result column="patrol_task_name" property="patrolTaskName"/>
<result column="patrol_task_type" property="patrolTaskType"/>
<result column="execute_time" property="executeTime"/>
@@ -22,13 +23,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 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}
@@ -42,6 +56,12 @@
<if test="param2.taskStatus != null and param2.taskStatus != ''">
and pt.task_status = #{param2.taskStatus}
</if>
+ <if test="param3 != null and param3.size > 0">
+ and pt.create_dept in
+ <foreach collection="param3" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != '' ">
and pt.execute_time BETWEEN #{param2.startTime} AND #{param2.endTime}
</if>
@@ -53,4 +73,21 @@
SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
</select>
+ <!-- 自定义更新工单状态语句 -->
+ <update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ UPDATE ja_gd_work_order
+ <set>
+ <if test="workOrderParam.workOrderStatus != null">
+ work_order_status = #{workOrderParam.workOrderStatus},
+ </if>
+ <if test="workOrderParam.updateUser != null">
+ update_user = #{workOrderParam.updateUser},
+ </if>
+ <if test="workOrderParam.updateTime != null">
+ update_time = #{workOrderParam.updateTime},
+ </if>
+ </set>
+ WHERE id = #{workOrderParam.id}
+ </update>
+
</mapper>
--
Gitblit v1.9.3