From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 814e30e..cceae1d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -8,6 +8,7 @@
<result column="device_id" property="deviceId"/>
<result column="area_divide_id" property="areaDivideId"/>
<result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="defense_scene_name" property="defenseSceneName"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="dispatch_user" property="dispatchUser"/>
@@ -35,38 +36,42 @@
<select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
select
- ts.id,
- ts.device_id,
- ts.area_divide_id,
- ts.defense_scene_id,
- ts.longitude,
- ts.latitude,
- ts.dispatch_user,
- ts.dispatch_start_time,
- ts.dispatch_end_time,
- ts.dispatch_content,
- ts.dispatch_result,
- ts.dispose_measure,
- ts.area_code,
- ts.create_user,
- ts.create_dept,
- ts.create_time,
- ts.update_user,
- ts.update_time,
- ts.is_deleted,
- d.device_sn,
- d.device_name,
- d.device_type,
- d.status as device_status,
- ad.longitude as device_longitude,
- ad.latitude as device_latitude,
- ad.area_name,
- dz.zone_name as defense_zone_name
- from ja_fw_task_schedule ts
- left join ja_fw_device d on d.id = ts.device_id and d.is_deleted = 0
- left join ja_fw_area_divide ad on ad.id = ts.area_divide_id and ad.is_deleted = 0
- left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id and ds.is_deleted = 0
- left join ja_fw_defense_zone dz on dz.is_deleted = 0
+ ts.id,
+ ts.device_id,
+ ts.area_divide_id,
+ ts.defense_scene_id,
+ ds.scene_name as defense_scene_name,
+ ts.longitude,
+ ts.latitude,
+ ts.dispatch_user,
+ ts.dispatch_start_time,
+ ts.dispatch_end_time,
+ ts.dispatch_content,
+ ts.dispatch_result,
+ ts.dispose_measure,
+ ts.area_code,
+ ts.create_user,
+ ts.create_dept,
+ ts.create_time,
+ ts.update_user,
+ ts.update_time,
+ ts.is_deleted,
+ d.device_sn,
+ d.device_name,
+ d.device_type,
+ d.status as device_status,
+ ad.area_name,
+ dz.zone_name as defense_zone_name
+ from
+ ja_fw_task_schedule ts
+ left join
+ ja_fw_device d on d.id = ts.device_id
+ left join
+ ja_fw_area_divide ad on ad.id = ts.area_divide_id
+ left join
+ ja_fw_defense_scene ds on ds.id = ts.defense_scene_id
+ left join
+ ja_fw_defense_zone dz on dz.is_deleted = 0
and dz.defense_scene_ids is not null
and dz.defense_scene_ids != ''
and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
@@ -84,6 +89,12 @@
<if test="param2.status != null and param2.status != ''">
and d.status = #{param2.status}
</if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and ts.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.9.3