From b5ae703a499b97fd83dd9a7b67a10a7b8157df5f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 09 十一月 2023 13:29:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
index 6964d83..95ade6e 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
@@ -102,6 +102,7 @@
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
+ <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@@ -164,8 +165,13 @@
</select>
<select id="fileYear" resultType="com.ruoyi.statistical.vo.CountVo">
- select to_char(alarm_time::DATE, 'MM') as month,count(id)
+ select to_char(alarm_time::DATE, 'MM') as date,count(id)
from ard_alarm_radar_fire
- where alarm_time >= #{start} and alarm_time <= #{end} group by month order by month
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
+ </select>
+ <select id="fileMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+ select to_char(alarm_time::DATE, 'dd') as date,count(id)
+ from ard_alarm_radar_fire
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3