From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 66b747d..3838d40 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.apache.ibatis.annotations.Mapper;
@@ -38,7 +39,9 @@
"canc.last_comment_num," +
"canc.last_fabulous_num," +
"canc.last_views_num," +
+ "canc.type," +
"su.nick_name as name," +
+ "su.community_id," +
"su.image_url as headUrl " +
" FROM " +
" com_act_neighbor_circle AS canc" +
@@ -48,7 +51,7 @@
" order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
" </if> " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>" +
- " order by canc.reply_at desc,canc.create_at desc " +
+ " order by canc.create_at desc " +
" </if> " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>" +
" order by (canc.views_num + canc.comment_num + canc.fabulous_num) desc " +
@@ -59,19 +62,18 @@
@Select("<script> " +
"select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " +
- ",canc.is_boutique,canc.create_at,canc.reply_at from com_act_neighbor_circle as canc " +
+ ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
" left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+
" </script>")
ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
@Select("<script> \n"+
"SELECT\n" +
"nc.*,\n" +
- "u.`name` AS releaseName,u.`type` as userType\n" +
- ",ca.name as communityName\n" +
+ "u.`nick_name` AS releaseName,u.`type` as userType\n" +
+ ",u.name as communityName\n" +
"FROM\n" +
"com_act_neighbor_circle nc\n" +
- "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
- "left join com_act ca on u.community_id=ca.community_id \n" +
+ "LEFT JOIN sys_user u ON nc.release_id = u.user_id \n" +
"<where>"+
"nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+
"<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" +
@@ -91,10 +93,20 @@
AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
@Select("<script> " +
- "select id,release_content,release_images,status,create_at,comment_num,fabulous_num,forward_num,views_num,refuse_reason " +
+ "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at" +
+ ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl " +
" from com_act_neighbor_circle as canc " +
- " where canc.release_id = #{userId} order by create_at desc" +
+ " left join sys_user as su on su.user_id = canc.release_id " +
+ " where canc.release_id = #{userId} and canc.status != 3 order by create_at desc" +
" </script>")
IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);
+ @Select("select reply.id,reply.comment_id,reply.reply_content,reply.fabulous_num,reply.create_at" +
+ ",reply.is_release,su.nick_name as userName,su.image_url as userHeadUrl,su1.nick_name as oldUserName" +
+ " from com_act_neighbor_circle_comment_reply as reply" +
+ " left join sys_user as su on su.user_id = reply.user_id" +
+ " left join sys_user as su1 on su1.user_id = reply.parent_user_id" +
+ " where reply.comment_id = #{commentId} and reply.status = 1")
+ IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);
+
}
--
Gitblit v1.7.1