From a7b550f95172e29d71aa38dca45cacf7f31949b8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 17 六月 2021 14:44:50 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
index 4f72973..a8fc4fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -9,10 +9,14 @@
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActDiscussDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,7 +36,7 @@
// " </if> " +
// " </where>" +
// "</script>")
- @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
+ @Select("select type,name,phone,image_url,nick_name from sys_user where user_id=#{userId}")
LoginUserInfoVO selectUserByUserId(Long userId);
@Select("<script> " +
"select t.* from ("+
@@ -42,6 +46,7 @@
"d.type,\n" +
"COUNT( DISTINCT c.id ) commentNum,\n" +
"u.name userName,\n" +
+ "u.nick_name userNickName,\n" +
"d.create_at \n" +
"FROM\n" +
"com_act_discuss d\n" +
@@ -65,6 +70,7 @@
"select * from ("+
"SELECT\n" +
"u.`name` userName,\n" +
+ "u.nick_name userNickName,\n" +
"u.phone,\n" +
"c.`comment`,\n" +
"c.`parent_id`,\n" +
@@ -103,6 +109,7 @@
"COUNT( DISTINCT c.id ) commentNum,\n" +
"COUNT( DISTINCT du.id ) signNum,\n" +
"if(u.type=1,u.name,a.name) userName,\n" +
+ "if(u.type=1,u.nick_name,a.name) userNickName,\n" +
"if(du.id is not null,1,0) haveSign,\n" +
"if(ou.id is not null,1,0) haveVote,\n" +
"u.image_url,\n" +
@@ -135,6 +142,7 @@
"select * from ("+
"SELECT\n" +
"u.`name` userName,\n" +
+ "u.nick_name userNickName,\n" +
"u.`image_url`,\n" +
"u.phone,\n" +
"c.`comment`,\n" +
@@ -181,4 +189,35 @@
"d.id =#{id}\n" +
"GROUP BY d.id")
ComActDiscussVO selectHaveSignAndHaveVote(@Param("id") Long id, @Param("loginUserId")Long loginUserId);
+
+ @Select(" SELECT COUNT(id) AS currentNum," +
+ "(SELECT COUNT(id) FROM com_act_discuss WHERE community_id = 2 AND type = 1)AS imgNum," +
+ "(" +
+ "SELECT COUNT(DISTINCT(user_id)) FROM (" +
+ " SELECT c.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_comment c ON d.id = c.discuss_id WHERE d.community_id = 2 AND d.type = 1 " +
+ " UNION ALL " +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_comment c ON d.id = c.discuss_id INNER JOIN com_act_discuss_comment_user u ON c.id = u.disscuss_comment_id WHERE d.community_id = 2 AND d.type = 1 " +
+ "UNION ALL " +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_option o ON d.id = o.discuss_id INNER JOIN com_act_discuss_option_user u ON o.id = u.discuss_option_id WHERE d.community_id = 2 AND d.type = 1 " +
+ " UNION ALL " +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_user u ON d.id = u.discuss_id WHERE d.community_id = 2 AND d.type = 1 " +
+ ")d " +
+ ")AS imgPeopleNum," +
+ "(SELECT COUNT(id) FROM com_act_discuss WHERE community_id = 2 AND type = 2)AS voteNum," +
+ "(" +
+ "SELECT COUNT(DISTINCT(user_id)) FROM (" +
+ " SELECT c.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_comment c ON d.id = c.discuss_id WHERE d.community_id = 2 AND d.type = 2 " +
+ " UNION ALL" +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_comment c ON d.id = c.discuss_id INNER JOIN com_act_discuss_comment_user u ON c.id = u.disscuss_comment_id WHERE d.community_id = 2 AND d.type = 2 " +
+ "UNION ALL " +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_option o ON d.id = o.discuss_id INNER JOIN com_act_discuss_option_user u ON o.id = u.discuss_option_id WHERE d.community_id = 2 AND d.type = 2 " +
+ " UNION ALL " +
+ " SELECT u.user_id FROM com_act_discuss d INNER JOIN com_act_discuss_user u ON d.id = u.discuss_id WHERE d.community_id = 2 AND d.type = 2 " +
+ ")d " +
+ ")AS votePeopleNum " +
+ " FROM com_act_discuss WHERE community_id = 2 AND create_at LIKE CONCAT('','%')")
+ Map<String, Long> countByCommunityId(@Param("communityId")Long communityId, @Param("date")String date);
+
+ @Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = #{communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
+ List<CarouselInfoVO> screenDiscuss(@Param("communityId") Long communityId, @Param("pageSize")Integer pageSize);
}
--
Gitblit v1.7.1