From 2400238fd8ae34a2f10a4ea35db9b1739c534a7e Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 13:34:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index e97b734..b2cd359 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -169,8 +169,13 @@
     </select>
 
     <select id="moveYear" 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_move
-        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
+        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
+    </select>
+    <select id="moveMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(alarm_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_radar_move
+        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3