Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java

@@ -1,17 +1,17 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;

/**
 * @auther lyq
@@ -21,26 +21,20 @@
@Mapper
public interface ComActNeighborCircleCommentReplyDAO extends BaseMapper<ComActNeighborCircleCommentReplyDO> {

    @Select("<script> " +
            "select reply.id,reply.comment_id, reply.reply_content,reply.fabulous_num " +
            ",reply.create_at,reply.is_release,su1.nick_name as userName " +
            ",su1.image_url as userHeadUrl,su2.nick_name as parentUserName " +
            " from com_act_neighbor_circle_comment_reply as reply" +
            " left join sys_user su1 on su1.user_id = reply.user_id " +
            " left join sys_user su2 on su2.user_id = reply.parent_user_id " +
            " where reply.status = 1 and reply.comment_id = #{commentId} order by create_at desc" +
            " </script>")
    @Select("<script> " + "select reply.id,reply.comment_id, reply.reply_content,reply.fabulous_num "
        + ",reply.create_at,reply.is_release,su1.nick_name as userName "
        + ",su1.image_url as userHeadUrl,su2.nick_name as parentUserName "
        + " from com_act_neighbor_circle_comment_reply as reply"
        + " left join sys_user su1 on su1.user_id = reply.user_id "
        + " left join sys_user su2 on su2.user_id = reply.parent_user_id "
        + " where reply.status = 1 and reply.comment_id = #{commentId} order by create_at desc" + " </script>")
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);

    @Select("<script> " +
            "select cr.*,u.name as userName,u.phone as userPhone,u.nick_name as userNickName  from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and dto.id!= 0l'>" +
            "cr.comment_id = #{dto.id}"+
            " </if> " +
            "</where>"+
            " ORDER BY cr.create_at"+
            "</script>")
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page page,@Param("dto") DetailNeighborCommentReplyByAdminDTO dto);
    @Select("<script> "
        + "select cr.*,u.name as userName,u.phone as userPhone,u.nick_name as userNickName  from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  "
        + "<where>" + "<if test='dto.id != null and dto.id!= 0l'>" + "cr.comment_id = #{dto.id}" + " </if> "
        + "</where>" + " ORDER BY cr.create_at" + "</script>")
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page page,
        @Param("dto") DetailNeighborCommentReplyByAdminDTO dto);

}