From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
index 4a4dff9..49d491f 100644
--- a/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id"/>
<result column="message_id" property="messageId"/>
<result column="audit_id" property="auditId"/>
+ <result column="real_audit_id" property="realAuditId"/>
<result column="audit_status" property="auditStatus"/>
<result column="audit_result" property="auditResult"/>
<result column="audit_opinion" property="auditOpinion"/>
@@ -16,10 +17,13 @@
<result column="update_time" property="updateTime"/>
</resultMap>
<resultMap type="com.ycl.entity.message.SmsAudit" id="CondMapResultMap" extends="BaseResultMap">
- <result column="audit_text" property="auditText"/>
<result column="title" property="title"/>
<result column="body" property="body"/>
+ <result column="audit_text" property="auditText"/>
+ <result column="real_audit_text" property="realAuditText"/>
<result column="create_user_text" property="createUserText"/>
+ <result column="update_user_text" property="updateUserText"/>
+ <result column="audit_status_text" property="auditStatusText"/>
</resultMap>
<select id="selectCondPage" parameterType="com.ycl.entity.message.SmsAudit" resultMap="CondMapResultMap">
@@ -28,13 +32,19 @@
um.head title,
um.body,
ua.username audit_text,
- ua2.username create_user_text
+ ua2.username create_user_text,
+ ua3.username update_user_text,
+ ua4.username real_audit_text,
+ ( CASE usa.audit_status WHEN '1' THEN '宸插鏍�' ELSE '寰呭鏍�' END ) audit_status_text
FROM
- ums_sms_audit usa
- LEFT JOIN ums_message um ON usa.message_id = um.id
- LEFT JOIN ums_admin ua ON usa.audit_id = ua.id
- LEFT JOIN ums_admin ua2 ON usa.create_user = ua2.id
- where 1=1
+ ums_sms_audit usa
+ LEFT JOIN ums_message um ON usa.message_id = um.id
+ LEFT JOIN ums_admin ua ON usa.audit_id = ua.id
+ LEFT JOIN ums_admin ua2 ON usa.create_user = ua2.id
+ LEFT JOIN ums_admin ua3 ON usa.update_user = ua3.id
+ LEFT JOIN ums_admin ua4 ON usa.real_audit_id = ua4.id
+ WHERE
+ 1 =1
<if test="smsAudit.auditId !=null and smsAudit.auditId >=0 ">
AND usa.audit_id = #{smsAudit.auditId}
</if>
--
Gitblit v1.8.0