电磁锁动作状态改为操控中...提交

zhangnaisong

2024-08-01 2799314298467be9ed68d9e19891e35cb3c3edad

 ard-work/src/main/resources/mapper/call/ArdCallHistoryMapper.xml

@@ -10,7 +10,11 @@
        <result property="content" column="content"/>
        <result property="sessionId" column="session_id"/>
        <result property="userId" column="user_id"/>
        <result property="nickName" column="nick_name"/>
        <result property="avatar" column="avatar"/>
        <result property="targetId" column="target_id"/>
        <result property="targetNickName" column="target_nick_name"/>
        <result property="targetAvatar" column="target_avatar"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
@@ -30,12 +34,32 @@
               update_time
        from ard_call_history
    </sql>

    <sql id="selectArdCallHistoryVo1">
        SELECT
            ach.ID,
            ach.TYPE,
            ach.CONTENT,
            ach.session_id,
            ach.user_id,
            ach.target_id,
            ach.create_by,
            ach.create_time,
            ach.update_by,
            ach.update_time,
            u.nick_name,
            u.avatar,
            u1.nick_name AS target_nick_name,
            u1.avatar AS target_avatar
        FROM
            ard_call_history ach
                LEFT JOIN sys_user u ON u.user_id = ach.user_id
                LEFT JOIN sys_user u1 ON u1.user_id = ach.target_id
    </sql>
    <select id="selectArdCallHistoryList" parameterType="ArdCallHistory" resultMap="ArdCallHistoryResult">
        <include refid="selectArdCallHistoryVo"/>
        <include refid="selectArdCallHistoryVo1"/>
        <where>
            <if test="sessionId != null  and sessionId != ''">and session_id= #{sessionId}</if>
            <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
            <if test="userId != null  and userId != ''">and ach.user_id = #{userId}</if>
            <if test="targetId != null  and targetId != ''">and target_id = #{targetId}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="content != null  and content != ''">and content = #{content}</if>
@@ -44,7 +68,7 @@
    </select>

    <select id="selectArdCallHistoryById" parameterType="String" resultMap="ArdCallHistoryResult">
        <include refid="selectArdCallHistoryVo"/>
        <include refid="selectArdCallHistoryVo1"/>
        where id = #{id}
    </select>