From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
index 99f3676..371bcb8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -8,9 +8,8 @@
sar.rule_name as ruleName,
sst.content templateContent,sst.sms_type as smsType
from sm_sms_result ssr
+ left join YWXT.sm_alarm_rule sar on sar.id = ssr.alarm_rule_id
left join sm_sms_template sst on sst.template_id = ssr.template_id and sst.is_deleted = 0
- left join YWXT.sm_alarm_rule_detail sard on sard.template_id = sst.id
- left join YWXT.sm_alarm_rule sar on sar.id = sard.alarm_rule_id
where 1=1 and ssr.is_deleted = 0
<if test="smsResult.templateId!=null and smsResult.templateId!=''">
and ssr.template_id = #{smsResult.templateId}
@@ -25,10 +24,10 @@
and sst.content like concat('%',#{smsResult.templateContent},'%')
</if>
<if test="smsResult.startTime!=null and smsResult.startTime!=''">
- and date_format(ssr.create_time,'%Y-%m-%d') >= #{smsResult.startTime}
+ and ssr.create_time >= #{smsResult.startTime}
</if>
<if test="smsResult.endTime!=null and smsResult.endTime!=''">
- and date_format(ssr.create_time,'%Y-%m-%d') <= #{smsResult.endTime}
+ and ssr.create_time <= #{smsResult.endTime}
</if>
<if test="smsResult.smsType!=null and smsResult.smsType!=''">
and sst.sms_type = #{smsResult.smsType}
@@ -39,7 +38,7 @@
#{id}
</foreach>
</if>
- order by id desc
+ order by ssr.id desc
</select>
</mapper>
--
Gitblit v1.9.3