From 7d9fbfdc05485c8e2cb457dffb1fd29580dfb41b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 16:02:15 +0800
Subject: [PATCH] Merge branch 'bigscreen_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index bc82aa7..7bc7c58 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -9,6 +9,8 @@
 import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
 import com.panzhihua.common.model.vos.community.screen.civil.*;
+import com.panzhihua.common.model.vos.community.bigscreen.BaseInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic;
 import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -211,13 +213,10 @@
             " where cmpct.community_id = #{communityId}")
     IndexBasicsStatisticsVO getScreenIndexByBasics(@Param("communityId") Long communityId);
 
-    @Select("SELECT " + " IFNULL( NULL, 1 ) AS type, " + " count( cmpct.id ) AS sum  " + "FROM "
-        + " com_mng_population_community_tags as cmpct  "
-        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 1  "
-        + " AND cmpct.community_id = #{communityId} UNION ALL " + "SELECT " + " IFNULL( NULL, 2 ) AS type, "
-        + " count( cmpct.id ) AS sum  " + "FROM " + " com_mng_population_community_tags as cmpct  "
-        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 2  "
-        + " AND cmpct.community_id = #{communityId}")
+    @Select("SELECT    cmp.sex as type,    count( cmpct.id ) AS sum,  count( cmpct.id )*100/(select count(*) from com_mng_population_community_tags as cmpct  \n" +
+            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE    cmpct.community_id = #{communityId} ) as percent    FROM \n" +
+            "          com_mng_population_community_tags as cmpct  \n" +
+            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE cmp.sex is not null  and  cmpct.community_id = #{communityId} GROUP BY cmp.sex")
     List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " e.happen_time as createAt, " + " e.event_des, " + " e.event_deal_status  " + "FROM "
@@ -280,6 +279,10 @@
     @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
         + " community_id = #{communityId} and label like concat('%',#{label},'%')")
     Integer getSpecialStatisticsByLabel(@Param("label") String label,@Param("communityId") Long communityId);
+
+    @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
+            + " community_id = #{communityId} ")
+    Integer getSpecialStatistics(@Param("communityId") Long communityId);
 
     @Select("<script> " + "SELECT " + " count( egd.id ) AS gridTotal, "
         + " ( select count(egmr.id) from event_grid_member_relation as egmr"
@@ -647,4 +650,25 @@
     Integer getPopulationAge(@Param("streetId") Long streetId, @Param("age") Integer age);
 
     List<EventPopulationStreetVO> getComprehensiveStreetList();
+
+    /**
+     * 基础数据统计
+     * @param communityId
+     * @return
+     */
+    BaseInfo baseInfo(Long communityId);
+
+    /**
+     * 业务数据统计
+     * @param communityId
+     * @return
+     */
+    IndexDynamic indexDynamic(Long communityId);
+
+    /**
+     * 大屏事件数据
+     * @param communityId
+     * @return
+     */
+    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1