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/ArdAlarmExternalMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml
index 0325f29..e3cad25 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml
@@ -183,4 +183,16 @@
           and alarm_time&lt;=#{alarmTime}
           and view_time is null
     </update>
+
+    <select id="externalYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(alarm_time::DATE, 'MM') as date,count(id)
+        from ard_alarm_external
+        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
+    </select>
+    <select id="externalMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(alarm_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_external
+        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