From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 349f3e2..403aa58 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
@@ -109,6 +109,7 @@
"d.photo_pah, " +
"d.`discuss_subject`, " +
"d.type, " +
+ "u.type as userType, " +
"COUNT( DISTINCT c.id ) commentNum, " +
"COUNT( DISTINCT du.id ) signNum, " +
"if(u.type=1,u.name,a.name) userName, " +
@@ -148,6 +149,7 @@
"u.nick_name userNickName, " +
"u.`image_url`, " +
"u.phone, " +
+ "u.type as userType, " +
"c.`comment`, " +
"c.`parent_id`, " +
"c.`is_author`, " +
@@ -193,8 +195,9 @@
"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(" SELECT COUNT(id) AS totalNum," +
+ "(SELECT COUNT(id) FROM com_act_discuss WHERE community_id = 2 AND create_at LIKE CONCAT('','%'))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 " +
@@ -205,8 +208,7 @@
" 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," +
+ ")AS commonPeopleNum," +
"(" +
"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 " +
@@ -217,8 +219,8 @@
" 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('','%')")
+ ")AS volunteerPeopleNum " +
+ " FROM com_act_discuss")
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}")
--
Gitblit v1.7.1