From ecc14b8398e4b7072a3e4b6096e084fadd4a51d8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 11:29:51 +0800
Subject: [PATCH] opt: sql改造其他模块改造3
---
drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml b/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml
index 3e3e978..7640bb6 100644
--- a/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml
+++ b/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml
@@ -124,7 +124,7 @@
oti.vox_grid_tiles_path,
oti.device_sn,
wj.dkbh,
- IFNULL( ST_AsText ( oti.geom ), ifnull( tli.sdfw, tli.dkfw )) AS geom
+ COALESCE( ST_AsText ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
FROM odm_task_info oti
left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
left join tb_lot_info tli on tli.dkbh = wj.dkbh::VARCHAR
@@ -174,7 +174,7 @@
oti.vox_grid_tiles_path,
oti.device_sn,
tli.dkbh,
- IFNULL( ST_AsText ( oti.geom ), ifnull( tli.sdfw, tli.dkfw )) AS geom
+ COALESCE( ST_AsText ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
FROM
odm_task_info oti
LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR AND wj.is_deleted = 0
@@ -195,7 +195,7 @@
</if>
<if test="lotInfoId != null and lotInfoId != ''">
AND (
- FIND_IN_SET(#{lotInfoId}, wj.lot_info_id) > 0
+ #{lotInfoId} = ANY(string_to_array(wj.lot_info_id, ',')::bigint[])
OR wj.lot_info_id = #{lotInfoId}
)
</if>
--
Gitblit v1.9.3