From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/sms/SmsTaskMapper.xml | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/sms/SmsTaskMapper.xml b/src/main/resources/mapper/sms/SmsTaskMapper.xml
index 9a453f0..978ff2c 100644
--- a/src/main/resources/mapper/sms/SmsTaskMapper.xml
+++ b/src/main/resources/mapper/sms/SmsTaskMapper.xml
@@ -4,19 +4,20 @@
<select id="queryPage" resultType="com.mzl.flower.dto.response.sms.SmsTaskVO">
- select t.* from t_sms_task t
+ SELECT
+ t.* ,st.`name` as sms_template_name,st.description as sms_template_desc
+ FROM
+ t_sms_task t
+ LEFT JOIN t_sms_template st ON t.sms_template_id = st.id
where t.deleted= 0
- <if test="dto.id!=null ">
- and t.id = #{dto.id}
- </if>
- <if test="dto.code != null and dto.code != ''">
- and t.code like concat('%', #{dto.code}, '%')
- </if>
<if test="dto.name != null and dto.name != ''">
and t.name like concat('%', #{dto.name}, '%')
</if>
- <if test="dto.description != null and dto.description != ''">
- and t.description like concat('%', #{dto.description}, '%')
+ <if test="dto.smsTemplateName != null and dto.smsTemplateName != ''">
+ and st.name like concat('%', #{dto.smsTemplateName}, '%')
+ </if>
+ <if test="dto.status != null and dto.status != ''">
+ and t.status = #{dto.status}
</if>
<if test="dto.startDate!=null ">
<![CDATA[
--
Gitblit v1.9.3