From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
index 11a0af3..9862163 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
@@ -1,8 +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 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;
 
 /**
  * @auther lyq
@@ -12,4 +21,26 @@
 @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.comment_id = #{commentId} order by create_at desc limit 2" +
+            " </script>")
+    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);
+
+    @Select("<script> " +
+            "select cr.*,u.name as userName 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 pageActWorkGuideDTO.dto!= 0l'>" +
+            "comment_id = #{dto.id}"+
+            " </if> " +
+            "</where>"+
+            " ORDER BY create_at"+
+            "</script>")
+    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page<ComActNeighborCircleCommentReplyDO> page, DetailNeighborCommentReplyByAdminDTO dto);
+
 }

--
Gitblit v1.7.1