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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

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

@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,8 +27,24 @@
            ",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl " +
            " from com_act_neighbor_circle_comment as cancc " +
            " left join sys_user as su on su.user_id = cancc.user_id" +
            " where cancc.circle_id = #{circleId} order by cancc.create_at desc" +
            " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1" +
            "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>" +
            " order by cancc.create_at desc" +
            " </if> " +
            "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>" +
            " order by cancc.create_at asc" +
            " </if> " +
            " </script>")
    IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("circleId") Long circleId);
    IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    @Select("<script> " +
            "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
            "circle_id = #{dto.id}"+
            " </if> " +
            "</where>"+
            " ORDER BY create_at"+
            "</script>")
    IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
}