From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index 195196a..5546e76 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -196,8 +196,13 @@
           and view_time is null
     </update>
     <select id="tubeYear" resultType="com.ruoyi.statistical.vo.CountVo">
-        select to_char(create_time::DATE, 'MM') as month,count(id)
+        select to_char(create_time::DATE, 'MM') as date,count(id)
         from ard_alarm_tube
-        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by month order by month
+        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
+    </select>
+    <select id="tubeMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(create_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_tube
+        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3