From 4590e734d42f6c293184e1801670cef7eae03c02 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 8 Jan 2020 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/SmsLogDTO.java    |  5 ++
 .../elink/esua/epdc/entity/SmsLogEntity.java  |  7 +++
 .../src/main/resources/mapper/SmsLogDao.xml   | 49 ++++++++++---------
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/dto/SmsLogDTO.java b/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/dto/SmsLogDTO.java
index 30f619987..c928c98a3 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/dto/SmsLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/dto/SmsLogDTO.java
@@ -109,4 +109,9 @@ public class SmsLogDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 模板类型名称
+     */
+    private String templateTypeName;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/entity/SmsLogEntity.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/entity/SmsLogEntity.java
index 82a954d53..5c3e133fe 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/entity/SmsLogEntity.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/entity/SmsLogEntity.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
@@ -75,4 +76,10 @@ public class SmsLogEntity extends BaseEpdcEntity {
 	 */
 	private Integer platform;
 
+	/**
+	 * 模板类型名称
+	 */
+	@TableField(exist = false)
+	private String templateTypeName;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsLogDao.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsLogDao.xml
index 7b9223e55..2b1742fb5 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsLogDao.xml
@@ -22,36 +22,41 @@
 
     <select id="getPage" resultType="com.elink.esua.epdc.dto.SmsLogDTO">
         select
-        ID,
-        SMS_TEMPLATE_ID,
-        MOBILE,
-        PARAMS1,
-        PARAMS2,
-        PARAMS3,
-        PARAMS4,
-        STATUS,
-        PLATFORM,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME,
-        DEL_FLAG
-        from epdc_sms_log
-        where DEL_FLAG = '0'
+        sl.ID,
+        sl.SMS_TEMPLATE_ID,
+        sl.MOBILE,
+        sl.PARAMS1,
+        sl.PARAMS2,
+        sl.PARAMS3,
+        sl.PARAMS4,
+        sl.STATUS,
+        sl.PLATFORM,
+        sl.REVISION,
+        sl.CREATED_BY,
+        sl.CREATED_TIME,
+        sl.UPDATED_BY,
+        sl.UPDATED_TIME,
+        sl.DEL_FLAG,
+        st.TEMPLATE_TYPE_NAME
+        from epdc_sms_log sl
+        left join epdc_sms_template st on sl.SMS_TEMPLATE_ID = st.ID
+        where sl.DEL_FLAG = '0' and st.DEL_FLAG = '0'
         <if test="id != null and id != ''">
-            and ID like '%' #{id} '%'
+            and sl.ID like '%' #{id} '%'
         </if>
         <if test="mobile != null and mobile != ''">
-            and MOBILE like '%' #{mobile} '%'
+            and sl.MOBILE like '%' #{mobile} '%'
         </if>
         <if test="status != null and status != ''">
-            and STATUS = #{status}
+            and sl.STATUS = #{status}
         </if>
         <if test="platform != null and platform != ''">
-            and PLATFORM = #{platform}
+            and sl.PLATFORM = #{platform}
         </if>
-        order by UPDATED_TIME desc
+        <if test="templateType != null and templateType != ''">
+            and st.TEMPLATE_TYPE = #{templateType}
+        </if>
+        order by sl.CREATED_TIME desc
     </select>