From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +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 | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 b73ae6a..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,7 +4,41 @@
<!--自定义分页列表查询-->
<select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
- select * from sm_sms_result where 1=1 and is_deleted = 0
+ 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>
+ <if test="smsResult.startTime!=null and smsResult.startTime!=''">
+ and date_format(ssr.create_time,'%Y-%m-%d') >= #{smsResult.startTime}
+ </if>
+ <if test="smsResult.endTime!=null and smsResult.endTime!=''">
+ and date_format(ssr.create_time,'%Y-%m-%d') <= #{smsResult.endTime}
+ </if>
+ <if test="smsResult.smsType!=null and smsResult.smsType!=''">
+ and sst.sms_type = #{smsResult.smsType}
+ </if>
+ <if test="list!=null and list.size()>0">
+ and sst.template_id in
+ <foreach collection="list" item="id" separator ="," open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
order by id desc
</select>
--
Gitblit v1.9.3