From 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:13:10 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 15 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 39a7bef..50ef8f3 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
@@ -6,12 +6,14 @@
<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"/>
<result column="patrol_route_url" property="patrolRouteUrl"/>
<result column="recommend_flyer_name" property="recommendFlyerName"/>
<result column="device_id" property="deviceId"/>
+ <result column="device_name" property="deviceName"/>
<result column="task_desc" property="taskDesc"/>
<result column="task_status" property="taskStatus"/>
<result column="area_code" property="areaCode"/>
@@ -28,21 +30,32 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
- 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
+ pt.*,
+ md.nickname as device_name,
+ 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_manage_device md on md.id = pt.device_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
+ 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>
+ pt.is_deleted = 0
<if test="param2.workOrderId != null and param2.workOrderId != ''">
and pt.work_order_id = #{param2.workOrderId}
</if>
@@ -55,9 +68,9 @@
<if test="param2.taskStatus != null and param2.taskStatus != ''">
and pt.task_status = #{param2.taskStatus}
</if>
- <if test="param3 != null and param3.size > 0">
+ <if test="param2.deptList != null and param2.deptList.size > 0">
and pt.create_dept in
- <foreach collection="param3" item="deptId" open="(" separator="," close=")">
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
@@ -72,4 +85,60 @@
SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
</select>
+ <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ SELECT
+ pt.*,
+ md.airport_id as airport_id
+ FROM
+ ja_gd_patrol_task pt
+ left join
+ ja_gd_manage_device md on md.id = pt.device_id
+ WHERE pt.id = #{patrolTaskId}
+ </select>
+
+
+ <select id="getPatrolTaskDetail" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ SELECT
+ pt.*,
+ md.airport_id as airport_id,
+ md.height,
+ md.longitude,
+ md.latitude,
+ md.nickname as device_name,
+ wo.work_order_name
+ FROM
+ ja_gd_patrol_task pt
+ left join
+ ja_gd_work_order wo on pt.work_order_id = wo.id
+ left join
+ ja_gd_manage_device md on md.id = pt.device_id
+ WHERE pt.id = #{id}
+ </select>
+
+ <select id="getWorkOrderIdById" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ SELECT
+ *
+ FROM
+ ja_gd_work_order
+ WHERE id = #{id}
+ AND work_order_status = #{code}
+ </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