Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-11-10 dd99da83d2708dc1fdb84f9fa71b5e63d5579338

 flower_city/src/main/resources/mapper/GuideEvolveMapper.xml

@@ -60,6 +60,42 @@
        order by create_time desc
    </select>

    <select id="selectHideList" resultMap="GuideEvolveResult">
        SELECT
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,
            state,
            remark,
            guide_id,
            transaction_id,
            accessory_id,
            accessory_name,
            accessory_url,
            from_departmental_id,
            video_url,
            picture_url,
            create_time,
            update_time,
            guide_order_num,
            is_timeout
        FROM
            automessage_guide_evolve a
        <where>
            <if test="guideId != null and guideId != ''">
                AND guide_id=#{guideId}
            </if>
        </where>
        order by create_time desc
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        insert into automessage_guide_evolve (