From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 005131b..67fbd9f 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -482,9 +482,9 @@
) a
left join
(
- select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
+ select DATE_FORMAT(time,'%Y-%m-%d') as datetime, count(*) as count from sys_taskqd
where 1=1
- group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
+ group by DATE_FORMAT(time,'%Y-%m-%d')
) b
on
a.click_date = b.datetime
@@ -717,12 +717,12 @@
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
- union
+ union all
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999
--
Gitblit v1.9.3