From 63f25d9b1989f37b1a07bb59359d2091d480ff4e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Sep 2023 16:21:03 +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 | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 4712327..99f3676 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
@@ -4,13 +4,23 @@
<!--自定义分页列表查询-->
<select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
- select ssr.*,sst.content templateContent,sst.sms_type as smsType
+ select ssr.*,
+ sar.rule_name as ruleName,
+ sst.content templateContent,sst.sms_type as smsType
from sm_sms_result ssr
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}
</if>
+ <if test="smsResult.resCode==0">
+ and ssr.res_code =0
+ </if>
+ <if test="smsResult.resCode==1">
+ and ssr.res_code !=0
+ </if>
<if test="smsResult.templateContent!=null and smsResult.templateContent!=''">
and sst.content like concat('%',#{smsResult.templateContent},'%')
</if>
--
Gitblit v1.9.3