短信日志

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;
+
 }

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;
+
 }

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,
+        sl.ID,
-        SMS_TEMPLATE_ID,
+        sl.SMS_TEMPLATE_ID,
-        MOBILE,
+        sl.MOBILE,
-        PARAMS1,
+        sl.PARAMS1,
-        PARAMS2,
+        sl.PARAMS2,
-        PARAMS3,
+        sl.PARAMS3,
-        PARAMS4,
+        sl.PARAMS4,
-        STATUS,
+        sl.STATUS,
-        PLATFORM,
+        sl.PLATFORM,
-        REVISION,
+        sl.REVISION,
-        CREATED_BY,
+        sl.CREATED_BY,
-        CREATED_TIME,
+        sl.CREATED_TIME,
-        UPDATED_BY,
+        sl.UPDATED_BY,
-        UPDATED_TIME,
+        sl.UPDATED_TIME,
-        DEL_FLAG
+        sl.DEL_FLAG,
-        from epdc_sms_log
+        st.TEMPLATE_TYPE_NAME
-        where DEL_FLAG = '0'
+        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>