From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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 1a9f4fb..8d7d137 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`, " +
@@ -194,30 +196,28 @@
ComActDiscussVO selectHaveSignAndHaveVote(@Param("id") Long id, @Param("loginUserId")Long loginUserId);
@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(id) FROM com_act_discuss WHERE community_id = #{communityId} AND create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now())AS currentNum," +
+ "(SELECT COUNT(id) FROM com_act_discuss WHERE community_id = #{communityId} 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 commonPeopleNum," +
+ "SELECT " +
+ " count(distinct cadc.user_id) " +
+ "FROM " +
+ " com_act_discuss_comment AS cadc " +
+ " LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id " +
+ " where cad.type = 1 and cad.community_id = #{communityId} " +
+ ")AS imgPeopleNum," +
"(" +
- "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 volunteerPeopleNum " +
+ "select count(user_id) from ( " +
+ "SELECT " +
+ " distinct cadc.user_id " +
+ "FROM " +
+ " com_act_discuss_comment AS cadc " +
+ " LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id " +
+ " where cad.type = 2 and cad.community_id = #{communityId} " +
+ " union all " +
+ " SELECT DISTINCT cadou.user_id FROM com_act_discuss_option_user AS cadou LEFT JOIN com_act_discuss_option AS cado ON cado.id = cadou.discuss_option_id left join com_act_discuss as cad on cad.id = cado.discuss_id where cad.community_id = #{communityId}" +
+ ") t" +
+ ")AS votePeopleNum " +
" FROM com_act_discuss")
Map<String, Long> countByCommunityId(@Param("communityId")Long communityId, @Param("date")String date);
--
Gitblit v1.7.1