From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
index d6fc8f8..b7cfb6e 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
@@ -22,8 +22,15 @@
 
     <select id="selectArdAlarmApponekeyList" parameterType="ArdAlarmApponekey" resultMap="ArdAlarmApponekeyResult">
         <include refid="selectArdAlarmApponekeyVo"/>
-        <where>  
+        <where>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectArdAlarmApponekeyById" parameterType="String" resultMap="ArdAlarmApponekeyResult">
@@ -121,4 +128,15 @@
           and create_time &lt;= #{createTime}
           and view_time is null
     </update>
+
+    <select id="apponekeyYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(create_time::DATE, 'MM') as date,count(id)
+        from ard_alarm_apponekey
+        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
+    </select>
+    <select id="apponekeyMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(create_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_apponekey
+        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