From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index c0d415c..777dddb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -1,7 +1,10 @@
 package com.panzhihua.service_community.dao;
 
+import java.util.List;
 import java.util.Map;
 
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+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;
@@ -23,13 +26,13 @@
  **/
 @Mapper
 public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
-    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "COUNT(u.id)readNum, " + "d.`status`, "
+    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "IFNULL(u.readNum,0) readNum, " + "d.`status`, "
         + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, d.jump_url,d.jump_type, " + "d.is_topping, " + "d.publish_at, "
         + "d.create_at, " + "cadt.`name` as typeName, " + "cadt.color as typeColor, " + "ca.name as communityName  "
-        + "FROM " + "com_act_dyn d " + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
+        + "FROM " + "com_act_dyn d " + "LEFT JOIN ( select dyn_id,count(id) as readNum from com_act_dyn_user GROUP BY dyn_id  )  u ON d.id = u.dyn_id  "
         + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
         + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE 1=1  "
-        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id=#{comActDynVO.communityId} " + " </if> "
+        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id = ${comActDynVO.communityId} " + " </if> "
         + "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>"
         + "AND d.title like concat(#{comActDynVO.title},'%')   " + " </if> "
         + "<if test='comActDynVO.isTopping != null '>" + "AND d.is_topping = #{comActDynVO.isTopping}  " + " </if> "
@@ -48,7 +51,7 @@
         + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
         + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
         + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE  "
-        + "d.community_id=#{comActDynVO.communityId} "
+        + "d.community_id = ${comActDynVO.communityId} "
         + "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>"
         + "AND d.title like concat(#{comActDynVO.title},'%')   " + " </if> "
         + "<if test='comActDynVO.isTopping != null '>" + "AND d.is_topping = #{comActDynVO.isTopping}  " + " </if> "
@@ -60,17 +63,25 @@
     IPage<ComActDynVO> pageDynamicByAdmin(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
 
     @Select("SELECT " + " count( cad.id ) AS dynTotal, "
-        + " (select count(id) from com_act_dyn where community_id = #{communityId} and create_at LIKE CONCAT(#{nowDate},'%')) as currentNum "
-        + "FROM " + " com_act_dyn AS cad  " + "WHERE " + " community_id = #{communityId}")
+        + " (select count(id) from com_act_dyn where community_id = ${communityId} and create_at LIKE CONCAT(#{nowDate},'%')) as currentNum "
+        + "FROM " + " com_act_dyn AS cad  " + "WHERE " + " community_id = ${communityId}")
     Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
 
-    @Select("select create_at as startTime,(select create_at from com_act_dyn where community_id = #{communityId} order by create_at desc LIMIT 1 ) as endTime from com_act_dyn where community_id = #{communityId} order by create_at asc LIMIT 1")
+    @Select("select create_at as startTime,(select create_at from com_act_dyn where community_id = ${communityId} order by create_at desc LIMIT 1 ) as endTime from com_act_dyn where community_id = ${communityId} order by create_at asc LIMIT 1")
     DateScreenVO countByAvgCommunityId(@Param("communityId") Long communityId);
 
     @Select("SELECT "
-        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = #{communityId} AND create_at < #{end}) AS dynTotal, "
-        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = #{communityId} AND #{start} < create_at AND create_at < #{end}) AS dynAdd "
+        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = ${communityId} AND create_at < #{end}) AS dynTotal, "
+        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = ${communityId} AND #{start} < create_at AND create_at < #{end}) AS dynAdd "
         + " FROM DUAL")
     DynamicWorkVO countByTime(@Param("start") String start, @Param("end") String end,
         @Param("communityId") Long communityId);
+
+    List<StatisticsCommVO> getIndexDynBaseData(@Param("communityId") Long communityId);
+
+    List<StatisticsCommVO> getDynAddPolylineData(@Param("communityId") Long communityId);
+
+    StatisticsCommVO getDynTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
+
+    IPage<ComActDynVO> indexDynList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
 }

--
Gitblit v1.7.1