From a17551833794cceabddff337bf185dbfb97b44ae Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 25 七月 2024 10:33:01 +0800
Subject: [PATCH] 电磁锁打印注释提交

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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..de99376 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -24,6 +24,9 @@
         <include refid="Base_Column_List"/>
         from ard_alarm_stealelec
         <where>
+            <if test="name != null  and name != ''">
+                AND name like concat('%', #{name}, '%')
+            </if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
                 AND start_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
             </if>
@@ -130,9 +133,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>
 
-</mapper>
\ No newline at end of file
+    <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>

--
Gitblit v1.9.3