From 926b06f825f5e52ac0dcfc95b0abd7c25562eb14 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 07 Apr 2026 20:50:44 +0800
Subject: [PATCH] opt: 人大金仓数据库改造
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
index a1fb8bc..4c84175 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -72,9 +72,10 @@
<if test="param2.droneName != null and param2.droneName != '' or (param2.droneSerialNo != null and param2.droneSerialNo != '')">
and (
- 1=2 <if test="param2.droneName != null and param2.droneName != ''">
- or dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
- </if>
+ 1=2
+ <if test="param2.droneName != null and param2.droneName != ''">
+ or dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
+ </if>
<if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
</if>
@@ -90,7 +91,7 @@
</if>
<if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
- and dar.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
+ and dar.alarm_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
</if>
<if test="param2.deviceType != null and param2.deviceType != ''">
--
Gitblit v1.9.3