From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
index c5b241c..19a7e29 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -130,9 +130,14 @@
     </insert>
 
     <select id="stealelecYear" resultType="com.ruoyi.statistical.vo.CountVo">
-        select to_char(start_time::DATE, 'MM') as month,count(id)
+        select to_char(start_time::DATE, 'MM') as date,count(id)
         from ard_alarm_stealelec
-        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by month order by month
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
     </select>
 
+    <select id="stealelecMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(start_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_stealelec
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3