From c36f719ebd38b9fe269547dbc036d8535b498ce9 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 16:43:51 +0800
Subject: [PATCH] token获取物业id处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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 e7b8da8..d08efb4 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,7 +4,9 @@
 import java.util.List;
 import java.util.Map;
 
+import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -49,7 +51,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() != &quot;&quot;'>"
 //        + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' )  " + " </if> "
 //        + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin}  "
@@ -107,7 +109,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() != &quot;&quot;'>"
@@ -142,7 +144,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 "
@@ -156,13 +158,13 @@
 
     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}")
+    @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);
 
     @Select("<script> " + "SELECT " + " cad.id, " + " su.nick_name AS userName, " + " su.image_url, "
         + " cad.create_at, " + " cad.type, " + " cad.discuss_subject, " + " cad.photo_pah  " + "FROM "
         + " com_act_discuss AS cad " + " LEFT JOIN sys_user AS su ON su.user_id = cad.user_id  " + " <where> "
-        + "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = #{discussListDTO.communityId} "
+        + "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = ${discussListDTO.communityId} "
         + " </if> " + "<if test='discussListDTO.startTime!=null and discussListDTO.startTime != &quot;&quot;'>"
         + " AND DATE_FORMAT(cad.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{discussListDTO.startTime} "
         + " </if> " + "<if test='discussListDTO.endTime!=null and discussListDTO.endTime != &quot;&quot;'>"
@@ -226,4 +228,18 @@
      * @return
      */
     List<String> getTitles(@Param("type") int type, @Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 金沙定制页面-四长四员院落议事展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    IPage<ComActDiscussVO> pageCourtyardDiscuss(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+    /**
+     * 金沙定制页面-院落议事基础统计数据
+     * @param communityId
+     * @return
+     */
+    BigScreenCourtyardStatisticsInfo getCourtyardBaseData(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1