Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-11-17 a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserFeedbackDAO.xml

@@ -16,23 +16,22 @@
    <sql id="columns">
      `id`,`content`,`photo_path`,`create_at`,`update_at`,`user_id`,`area_id`,`community_id`,`status`
   </sql>
    <update id="reply">
        update sys_user_feedback set reply=#{dto.reply} where id=#{dto.id}
    </update>


    <select id="detailFeedback" resultType="com.panzhihua.common.model.vos.user.SysUserFeedbackVO">
        select
        u.name,
        u.nick_name,
        f.id,
        f.content,
        f.photo_path,
        f.*,
        u.phone,
        f.create_at,
        c.name communityName
        from sys_user_feedback f
        join sys_user u on f.user_id=u.user_id
        join com_act c on u.community_id=c.community_id
        where f.id=#{id}

    </select>

    <select id="pageFeedback" resultType="com.panzhihua.common.model.vos.user.SysUserFeedbackVO">
@@ -44,7 +43,8 @@
        f.create_at,
        f.content,
        f.photo_path,
        c.name communityName
        c.name communityName,
        f.reply
        from sys_user_feedback f
        left join sys_user u on f.user_id=u.user_id
        left join com_act c on u.community_id=c.community_id
@@ -61,6 +61,12 @@
            <if test='pageFeedBackDTO.areaCode != null and pageFeedBackDTO.areaCode.trim() != &quot;&quot;'>
                and c.area_code = #{pageFeedBackDTO.areaCode}
            </if>
            <if test="pageFeedBackDTO.propertyId != null and pageFeedBackDTO.propertyId != ''">
                and f.property_id = #{pageFeedBackDTO.propertyId}
            </if>
            <if test="pageFeedBackDTO.type != null and pageFeedBackDTO.type != ''">
                and f.type = #{pageFeedBackDTO.type}
            </if>
        </where>
        order by f.create_at desc