From 9e1b909864e5c7b7bb174b3a2ccb3730f74679db Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Jul 2023 15:12:27 +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 | 5 ++++-
1 files changed, 4 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 e8e59ac..8cbde99 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,7 @@
<!--自定义分页列表查询-->
<select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
- select ssr.*,sst.content templateContent
+ select ssr.*,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
where 1=1 and ssr.is_deleted = 0
@@ -20,6 +20,9 @@
<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 sst.sms_type = #{smsResult.smsType}
+ </if>
order by id desc
</select>
--
Gitblit v1.9.3