Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/qw/domain/audit/QwMsgAuditMessage.java

@@ -16,6 +16,26 @@ public class QwMsgAuditMessage {
     private Long msgTime;
     private String msgType;
 
+    /**
+     * 发送方 from，冗余，对应明文 JSON 字段 from
+     */
+    private String fromUser;
+
+    /**
+     * 接收方列表，JSON，冗余，对应 tolist
+     */
+    private String toList;
+
+    /**
+     * 群聊 roomid，冗余，单聊可为空
+     */
+    private String roomId;
+
+    /**
+     * 发送人身份：1 企业内部（销售） 2 企业外部
+     */
+    private Integer fromUserRole;
+
     /**
      * text.content
      */

fs-service/src/main/resources/mapper/qw/QwMsgAuditMessageMapper.xml

@@ -11,6 +11,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="msgId"    column="msg_id"    />
         <result property="msgTime"    column="msg_time"    />
         <result property="msgType"    column="msg_type"    />
+        <result property="fromUser"    column="from_user"    />
+        <result property="toList"    column="to_list"    />
+        <result property="roomId"    column="room_id"    />
+        <result property="fromUserRole"    column="from_user_role"    />
         <result property="textContent"    column="text_content"    />
         <result property="mediaSdkfileid"    column="media_sdkfileid"    />
         <result property="mediaMd5sum"    column="media_md5sum"    />
@@ -26,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQwMsgAuditMessageVo">
-        select id, corp_id, seq, msg_id, msg_time, msg_type, text_content, media_sdkfileid, media_md5sum, media_size, media_play_length, media_width, media_height, media_file_name, media_file_ext, media_oss_url, raw_id, create_time from qw_msg_audit_message
+        select id, corp_id, seq, msg_id, msg_time, msg_type, from_user, to_list, room_id, from_user_role, text_content, media_sdkfileid, media_md5sum, media_size, media_play_length, media_width, media_height, media_file_name, media_file_ext, media_oss_url, raw_id, create_time from qw_msg_audit_message
     </sql>
 
     <select id="selectQwMsgAuditMessageList" parameterType="QwMsgAuditMessage" resultMap="QwMsgAuditMessageResult">
@@ -37,6 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="msgId != null  and msgId != ''"> and msg_id = #{msgId}</if>
             <if test="msgTime != null "> and msg_time = #{msgTime}</if>
             <if test="msgType != null  and msgType != ''"> and msg_type = #{msgType}</if>
+            <if test="fromUser != null  and fromUser != ''"> and from_user = #{fromUser}</if>
+            <if test="toList != null  and toList != ''"> and to_list = #{toList}</if>
+            <if test="roomId != null  and roomId != ''"> and room_id = #{roomId}</if>
+            <if test="fromUserRole != null "> and from_user_role = #{fromUserRole}</if>
             <if test="textContent != null  and textContent != ''"> and text_content = #{textContent}</if>
             <if test="mediaSdkfileid != null  and mediaSdkfileid != ''"> and media_sdkfileid = #{mediaSdkfileid}</if>
             <if test="mediaMd5sum != null  and mediaMd5sum != ''"> and media_md5sum = #{mediaMd5sum}</if>
@@ -63,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="msgId != null">msg_id,</if>
             <if test="msgTime != null">msg_time,</if>
             <if test="msgType != null">msg_type,</if>
+            <if test="fromUser != null">from_user,</if>
+            <if test="toList != null">to_list,</if>
+            <if test="roomId != null">room_id,</if>
+            <if test="fromUserRole != null">from_user_role,</if>
             <if test="textContent != null">text_content,</if>
             <if test="mediaSdkfileid != null">media_sdkfileid,</if>
             <if test="mediaMd5sum != null">media_md5sum,</if>
@@ -82,6 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="msgId != null">#{msgId},</if>
             <if test="msgTime != null">#{msgTime},</if>
             <if test="msgType != null">#{msgType},</if>
+            <if test="fromUser != null">#{fromUser},</if>
+            <if test="toList != null">#{toList},</if>
+            <if test="roomId != null">#{roomId},</if>
+            <if test="fromUserRole != null">#{fromUserRole},</if>
             <if test="textContent != null">#{textContent},</if>
             <if test="mediaSdkfileid != null">#{mediaSdkfileid},</if>
             <if test="mediaMd5sum != null">#{mediaMd5sum},</if>
@@ -105,6 +121,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="msgId != null">msg_id = #{msgId},</if>
             <if test="msgTime != null">msg_time = #{msgTime},</if>
             <if test="msgType != null">msg_type = #{msgType},</if>
+            <if test="fromUser != null">from_user = #{fromUser},</if>
+            <if test="toList != null">to_list = #{toList},</if>
+            <if test="roomId != null">room_id = #{roomId},</if>
+            <if test="fromUserRole != null">from_user_role = #{fromUserRole},</if>
             <if test="textContent != null">text_content = #{textContent},</if>
             <if test="mediaSdkfileid != null">media_sdkfileid = #{mediaSdkfileid},</if>
             <if test="mediaMd5sum != null">media_md5sum = #{mediaMd5sum},</if>