From f81daf22fd1fc7fb8593add4bb79a6e1cacaf9bf Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 26 Jan 2026 10:29:11 +0800
Subject: [PATCH] 任务记录调度去掉外表的isDeleted
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 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..fb52b1c 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"/>
@@ -39,6 +40,7 @@
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,
@@ -63,9 +65,9 @@
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_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 != ''
--
Gitblit v1.9.3