From 018af6bed3da8be2e7b846aa3e654f16f8f71654 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 十二月 2021 16:29:30 +0800
Subject: [PATCH] 12/29 河门口大屏特殊修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 dfe30b7..e7b8da8 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
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -48,7 +49,7 @@
// + "COUNT( DISTINCT c.id ) commentNum, " + "u.name userName, " + "u.nick_name userNickName, " + "d.create_at "
// + "FROM " + "com_act_discuss d " + "JOIN sys_user u ON d.user_id = u.user_id "
// + "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id "
-// + " where d.community_id=#{pageComActDiscussDTO.communityId}"
+// + " where d.community_id = #{pageComActDiscussDTO.communityId}"
// + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>"
// + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) " + " </if> "
// + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} "
@@ -75,6 +76,24 @@
IPage<ComActDiscussCommentVO> pageDiscussComment(Page page,
@Param("pageComActDiscussCommentDTO") PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+ /**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ IPage<ComActDiscussCommentVO> pageDiscussCommentAdmin(Page page,
+ @Param("pageComActDiscussCommentDTO") PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 默认查询评论下两条回复信息
+ * @param commentId 评论id
+ * @return 回复列表
+ */
+ List<ComActDiscussCommentVO> getDiscussCommentReplyList(@Param("commentId") Long commentId);
+
+
// @Select("<script> " + "select t.* from (" + "SELECT " + "d.id, " + "d.vote_title, "
// + "if(d.address is null or d.address='null',a.name,d.address )address, " + "d.photo_pah, "
// + "d.`discuss_subject`, " + "d.type, " + "d.end_time, " + "d.status, " + "d.views_num, " + "d.join_num, "
@@ -88,7 +107,7 @@
// + "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id "
// + "<if test='pageComActDiscussDTO.loginUserId != null '>"
// + "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId} "
-// + " </if> " + " where d.community_id=#{pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
+// + " </if> " + " where d.community_id = #{pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
// + "<if test='pageComActDiscussDTO.type != null '>"
// + " and d.`type` = #{pageComActDiscussDTO.type} " + " </if> "
// + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>"
@@ -123,7 +142,7 @@
IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page,
@Param("pageComActDiscussCommentDTO") PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
- @Select("select name,address from com_act where community_id=#{communityId}")
+ @Select("select name,address from com_act where community_id = #{communityId}")
ComActVO selectCommunity(Long communityId);
@Select("SELECT " + "if(du.id is not null,1,0)haveSign, " + "if(ou.id is not null,1,0)haveVote " + "FROM "
@@ -134,17 +153,7 @@
+ "WHERE " + "d.id =#{id} " + "GROUP BY d.id")
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 = #{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 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(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);
@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}")
@@ -166,6 +175,13 @@
+ ",( SELECT count( id ) FROM com_act_discuss_option_user WHERE discuss_option_id = c.id ) AS num " + " FROM "
+ " com_act_discuss_option AS c " + " WHERE c.discuss_id = #{discussId}" + " ORDER BY " + " num DESC")
List<ComActDiscussOptionVO> getScreenDiscussOptionList(@Param("discussId") Long discussId);
+
+ /**
+ * 添加议事投票评论数
+ * @param discussId 议事投票
+ * @param num 添加数量
+ */
+ void addCommentCount(@Param("discussId") Long discussId,@Param("num") Integer num);
/**
* 更新一起议主题状态
@@ -194,4 +210,20 @@
* @return
*/
int batchUpdateViewNum(@Param("needDealMap") HashMap<Long, Integer> needDealMap);
+
+ /**
+ * 居民自治-议事投票类型占比统计
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> selectTypePercent(@Param("communityId") Long communityId);
+
+ /**
+ * 获取一起议标题
+ * @param type
+ * @param communityId
+ * @param pageSize
+ * @return
+ */
+ List<String> getTitles(@Param("type") int type, @Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}
--
Gitblit v1.7.1