From 2799314298467be9ed68d9e19891e35cb3c3edad Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 八月 2024 08:14:18 +0800
Subject: [PATCH] 电磁锁动作状态改为操控中...提交
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
index a35adc3..b07c220 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
@@ -41,7 +41,7 @@
<include refid="selectArdAlarmWallVo"/>
<where>
<if test="wallId != null and wallId != ''">and wall_id = #{wallId}</if>
- <if test="wallName != null and wallName != ''">and wall_name = #{wallName}</if>
+ <if test="wallName != null and wallName != ''">and wall_name like concat('%', #{wallName}, '%')</if>
<if test="userId != null and userId != ''">and user_id = #{userId}</if>
<if test="alarmType != null and alarmType != ''">and alarm_type = #{alarmType}</if>
<!-- <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>-->
@@ -162,4 +162,14 @@
and create_time <= #{createTime}
and view_time is null
</update>
-</mapper>
\ No newline at end of file
+ <select id="wallYear" resultType="com.ruoyi.statistical.vo.CountVo">
+ select to_char(alarm_time::DATE, 'MM') as date,count(id)
+ from ard_alarm_wall
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
+ </select>
+ <select id="wallMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+ select to_char(alarm_time::DATE, 'dd') as date,count(id)
+ from ard_alarm_wall
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
+ </select>
+</mapper>
--
Gitblit v1.9.3