From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |  210 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 135 insertions(+), 75 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..bb44fcd 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
@@ -4,11 +4,14 @@
 import java.util.List;
 import java.util.Map;
 
+import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
 import com.panzhihua.common.model.dtos.property.CommonPage;
 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;
@@ -96,13 +99,13 @@
         + "cmp.special_situation, " + "cmp.phone, " + "cmp.remark, " + "cmp.native_place, " + "cmp.nation,  "
         + "cmpct.label,  " + "cmp.marriage,  " + "cmp.culture_level,  " + "cmp.profession,  " + "cmp.out_or_local,  "
         + "cmp.census_register,  " + "cmp.healthy,  " + "cmp.birthday,  " + "cmp.update_at,  " + "cmp.address,  "
-        + "cmp.is_rent  " + "FROM  " + "com_mng_population AS cmp "
+        + "cmp.is_rent,cmp.death  " + "FROM  " + "com_mng_population AS cmp "
         + " LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id  " + "<where>"
         + "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>"
         + "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " + " </if> "
         + "<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != &quot;&quot;'>"
         + "AND cmpct.label LIKE concat('%',#{comMngPopulationVO.label},'%') " + " </if> "
-        + "<if test='comMngPopulationVO.actId != null'>" + " and cmpct.community_id = #{comMngPopulationVO.actId} "
+        + "<if test='comMngPopulationVO.actId != null'>" + " and cmpct.community_id = ${comMngPopulationVO.actId} "
         + " </if> " + "<if test='comMngPopulationVO.outOrLocal != null'>"
         + " and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " + " </if> "
         + "<if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != &quot;&quot;'>"
@@ -131,6 +134,9 @@
         + "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime != comMngPopulationVO.ageEndTime'>"
         + "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageEndTimeEnd} and #{comMngPopulationVO.ageStartTime}"
         + " </if> "
+        + "<if test='comMngPopulationVO.searchKey != null and comMngPopulationVO.searchKey != &quot;&quot; '>"
+        + "AND (cmp.name like concat('%',#{comMngPopulationVO.searchKey},'%') or cmp.card_no_str like concat('%',#{comMngPopulationVO.searchKey},'%') or cmp.phone like concat('%',#{comMngPopulationVO.searchKey},'%') "
+        + " </if> "
         + "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>"
         + "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " + " </if> "
         + "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation != &quot;&quot;'>"
@@ -144,6 +150,13 @@
         + "</script>")
     IPage<ComMngPopulationVO> pagePopulation(Page page,
         @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO);
+
+    /**
+     * 导出老人列表
+     * @param comMngPopulationVO
+     * @return
+     */
+    List<ComMngPopulationVO> exportOld(@Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO);
 
     /**
      * 分页查询特殊群体列表
@@ -184,23 +197,29 @@
     AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode,
         @Param("districtCode") String districtCode);
 
-    @Select("select count(cmpct.id) as populationTotal "
-        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal "
-        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal "
-        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal "
-        + ",(select count(DISTINCT `name`) from com_mng_village where community_id = #{communityId}) as villageTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','刑释人员','%')) as rehabilitationTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','高龄老人','%')) as elderTotal "
-        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','养老金人员','%')) as pensionTotal "
-        + " from com_mng_population_community_tags as cmpct inner join com_mng_population as cmp on cmp.id = cmpct.population_id where community_id = #{communityId}")
+//    @Select("select count(cmpct.id) as populationTotal "
+//        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmp.out_or_local = 1) as localTotal "
+//        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmp.out_or_local = 2) as outTotal "
+//        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmpct.label is not null) as specialTotal "
+//        + ",(select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}) as villageTotal "
+//        + ",(select count(id) from com_mng_building where act_id = #{communityId}) as buildNum "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','刑释人员','%')) as rehabilitationTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','高龄老人','%')) as elderTotal "
+//        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','养老金人员','%')) as pensionTotal "
+//        + " from com_mng_population_community_tags as cmpct inner join com_mng_population as cmp on cmp.id = cmpct.population_id where community_id = ${communityId}")
+    /**
+     * 实有人口统计
+     * @param communityId
+     * @return
+     */
     ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
 
     @Select("select count(id) as populationTotal," +
@@ -208,21 +227,18 @@
             "IFNULL((select count(id) from com_mng_real_company where community_id = cmpct.community_id),0) as companyTotal, " +
             "IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = cmpct.community_id),0) as villageTotal " +
             " from com_mng_population_community_tags AS cmpct " +
-            " where cmpct.community_id = #{communityId}")
+            " 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 "
         + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
-        + " egd.grid_community_id = #{communityId}  " + " AND e.event_deal_status IN ( 1, 4 )  " + "ORDER BY "
+        + " egd.grid_community_id = ${communityId}  " + " AND e.event_deal_status IN ( 1, 4 )  " + "ORDER BY "
         + " e.happen_time DESC  " + " LIMIT 8")
     List<IndexEventListStatisticsVO> getScreenIndexByEventList(@Param("communityId") Long communityId);
 
@@ -234,33 +250,33 @@
         + " IFNULL(( SELECT count( id ) FROM com_act_questnaire WHERE community_id = camw.community_id ),0) AS investigationTotal, "
         + " IFNULL(( SELECT count( id ) FROM com_act_dyn WHERE community_id = camw.community_id AND STATUS = 1 ),0) AS propagandaTotal  "
         + "FROM " + " com_act_micro_wish AS camw  " + "WHERE " + " camw.STATUS = 6  "
-        + " AND camw.community_id = #{communityId}")
+        + " AND camw.community_id = ${communityId}")
     IndexDynamicStatisticsVO getScreenIndexByDynamic(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " count( e.id ) AS eventTFTotal, " + " IFNULL(( " + "  SELECT " + "   count( e1.id )  "
         + "  FROM " + "   `event` AS e1 " + "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  "
         + "  WHERE " + "   event_category = 1  " + "   AND event_type = 1  " + "   AND event_status = 2  "
-        + "   AND egd1.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventZATotal, "
+        + "   AND egd1.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventZATotal, "
         + " IFNULL(( " + "  SELECT " + "   count( e2.id )  " + "  FROM " + "   `event` AS e2 "
         + "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " + "  WHERE " + "   event_category = 1  "
-        + "   AND event_type = 3  " + "   AND event_status = 2  " + "   AND egd2.grid_community_id = #{communityId}  "
+        + "   AND event_type = 3  " + "   AND event_status = 2  " + "   AND egd2.grid_community_id = ${communityId}  "
         + "   ), " + "  0  " + " ) AS eventMDTotal, " + " IFNULL(( " + "  SELECT " + "   count( e3.id )  " + "  FROM "
         + "   `event` AS e3 " + "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " + "  WHERE "
         + "   event_category = 1  " + "   AND event_type = 6  " + "   AND event_status = 2  "
-        + "   AND egd3.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventTSTotal, "
+        + "   AND egd3.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventTSTotal, "
         + " IFNULL(( " + "  SELECT " + "   count( e4.id )  " + "  FROM " + "   `event` AS e4 "
         + "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " + "  WHERE " + "   event_category = 2  "
-        + "   AND event_status = 2  " + "   AND egd4.grid_community_id = #{communityId}  "
+        + "   AND event_status = 2  " + "   AND egd4.grid_community_id = ${communityId}  "
         + "   ), " + "  0  " + " ) AS eventBWDTotal, " + " IFNULL(( " + "  SELECT " + "   count( e5.id )  " + "  FROM "
         + "   `event` AS e5 " + "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " + "  WHERE "
         + "   event_category = 1  " + "   AND event_type = 2  " + "   AND event_status = 2  "
-        + "   AND egd5.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventGGTotal  " + "FROM "
+        + "   AND egd5.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventGGTotal  " + "FROM "
         + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
         + " e.event_category = 1  " + " AND e.event_type = 5  " + " AND e.event_status = 2  "
-        + " AND egd.grid_community_id = #{communityId}")
+        + " AND egd.grid_community_id = ${communityId}")
     IndexGridEventStatisticsVO getGridEventStatisticsList(@Param("communityId") Long communityId);
 
-    @Select("select id,grid_name from event_grid_data where grid_community_id = #{communityId}")
+    @Select("select id,grid_name from event_grid_data where grid_community_id = ${communityId}")
     List<EventGridDataVO> getGridDataListByCommunityId(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " count( e.id ) AS eventTFTotal, "
@@ -274,12 +290,16 @@
     IndexGridEventStatisticsVO getGridEventByGirdId(@Param("gridId") Long gridId);
 
     @Select("SELECT " + " tag_name, " + " sys_flag  " + "FROM " + " com_mng_user_tag  " + "WHERE " + " sys_flag = 1  "
-        + " OR community_id = #{communityId}")
+        + " OR community_id = ${communityId}")
     List<ComMngUserTagVO> getUserTagListByCommunityId(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
-        + " community_id = #{communityId} and label like concat('%',#{label},'%')")
+        + " 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"
@@ -306,14 +326,14 @@
         + " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
         + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
         + " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ) AS solveEventTotal  "
-        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{screenEventDTO.communityId} "
+        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = ${screenEventDTO.communityId} "
         + " </script>")
     EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
 
     @Select("SELECT " + " DATE_FORMAT( e.create_at, '%m' ) months  " + "FROM " + " `event` AS e "
         + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
         + " e.create_at BETWEEN concat( YEAR ( now()), '-01-01 00:00:00' )  "
-        + " AND concat( YEAR ( now()), '-12-31 23:59:59' )  " + " AND egd.grid_community_id = #{communityId}  "
+        + " AND concat( YEAR ( now()), '-12-31 23:59:59' )  " + " AND egd.grid_community_id = ${communityId}  "
         + "GROUP BY " + " months  " + "ORDER BY " + " count( e.id ) DESC  " + " LIMIT 3")
     List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
 
@@ -329,18 +349,18 @@
         + " e.happent_lat_lng, " + " e.event_type, " + " e.id, " + " e.event_deal_status  " + "FROM " + " `event` AS e "
         + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id "
         + " LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id  " + "WHERE "
-        + " egd.grid_community_id = #{communityId}  " + " AND e.event_status = 2  " + " AND e.event_deal_status = 1  "
+        + " egd.grid_community_id = ${communityId}  " + " AND e.event_status = 2  " + " AND e.event_deal_status = 1  "
         + " AND e.event_category = 1  " + "ORDER BY " + " e.happen_time DESC  " + " LIMIT 1")
     EventNewStatisticsVO getEventScreenRightTop(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " grid_name, " + " `data`, " + " line_color, " + " line_broadband, " + " id, " + " fill_color  "
-        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{communityId}")
+        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = ${communityId}")
     List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
 
     @Select("<script> " + "(SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng,e.create_at as createAt  "
         + "FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
         + " e.event_category = 1  " + " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " + " AND e.event_status = 2  "
-        + " AND egd.grid_community_id = #{screenEventDTO.communityId}  "
+        + " AND egd.grid_community_id = ${screenEventDTO.communityId}  "
         + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
         + " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
         + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
@@ -350,7 +370,7 @@
         + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
         + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
         + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
-        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
+        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = ${screenEventDTO.communityId}  "
         + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
         + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
         + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
@@ -361,14 +381,14 @@
         getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
 
     @Select("SELECT " + " count( id ) AS specialTotal, "
-        + " ( SELECT count( id ) FROM com_mng_population_community_tags WHERE label IS NOT NULL AND community_id = #{communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal  "
+        + " ( SELECT count( id ) FROM com_mng_population_community_tags WHERE label IS NOT NULL AND community_id = ${communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal  "
         + "FROM " + " com_mng_population_community_tags AS cmpct  " + "WHERE " + " label IS NOT NULL  "
-        + " AND community_id = #{communityId}")
+        + " AND community_id = ${communityId}")
     CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
         @Param("lastMonth") Date lastMonth);
 
     @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
-        + " com_mng_village AS cmv  " + "WHERE " + " community_id = #{communityId}")
+        + " com_mng_village AS cmv  " + "WHERE " + " community_id = ${communityId}")
     List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " count( id ) AS peopleNum, "
@@ -378,51 +398,55 @@
         + "FROM " + " com_mng_population AS cmp  " + "WHERE " + " village_id = #{villageId}")
     CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);
 
-    @Select("SELECT COUNT(cmpct.id) AS man,(SELECT COUNT(cmpct.id) 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}) AS woman "
-        + "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}")
+    @Select("SELECT COUNT(cmpct.id) AS man,(SELECT COUNT(cmpct.id) 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}) AS woman "
+        + "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}")
     Map<String, Long> countBySex(@Param("communityId") Long communityId);
 
     @Select("SELECT " + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) as aa where aa.age<= 16) as age16,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) as aa where aa.age<= 16) as age16,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 16 and aa.age<= 25) AS age25,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) AS aa WHERE aa.age > 16 and aa.age<= 25) AS age25,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 25 and aa.age<= 35) AS age35,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) AS aa WHERE aa.age > 25 and aa.age<= 35) AS age35,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  WHERE cmpct.community_id = ${communityId}) AS aa WHERE aa.age > 55) AS age55over")
     Map<String, Long> countByAge(@Param("communityId") Long communityId);
 
     @Select("SELECT COUNT(cmp.id)AS xx,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 2 AND cmpct.community_id = #{communityId}) as cz,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 3 AND cmpct.community_id = #{communityId}) as gz,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 4 AND cmpct.community_id = #{communityId}) as zz,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 5 AND cmpct.community_id = #{communityId}) as dz,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 6 AND cmpct.community_id = #{communityId}) as bk,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 7 AND cmpct.community_id = #{communityId}) as ss,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 8 AND cmpct.community_id = #{communityId}) as bs,"
-        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 9 AND cmpct.community_id = #{communityId}) as qt"
-        + " FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 1 AND cmpct.community_id = #{communityId}")
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 2 AND cmpct.community_id = ${communityId}) as cz,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 3 AND cmpct.community_id = ${communityId}) as gz,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 4 AND cmpct.community_id = ${communityId}) as zz,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 5 AND cmpct.community_id = ${communityId}) as dz,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 6 AND cmpct.community_id = ${communityId}) as bk,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 7 AND cmpct.community_id = ${communityId}) as ss,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 8 AND cmpct.community_id = ${communityId}) as bs,"
+        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 9 AND cmpct.community_id = ${communityId}) as qt"
+        + " FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 1 AND cmpct.community_id = ${communityId}")
     Map<String, Long> countByCulture(@Param("communityId") Long communityId);
 
-    @Select("select count(user_id) from sys_user where community_id = #{communityId} and type = 1")
+    @Select("select count(user_id) from sys_user where community_id = ${communityId} and type = 1")
     Long countUsedCommunityPopulation(@Param("communityId") Long communityId);
 
     @Select("SELECT " + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) as aa where aa.age<= 16) as age16,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = ${communityId}) as aa where aa.age<= 18) as age16,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id =  #{communityId}) AS aa WHERE aa.age > 16 and aa.age<= 27) AS age27,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id =  ${communityId}) AS aa WHERE aa.age > 19 and aa.age<= 30) AS age27,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = #{communityId}) AS aa WHERE aa.age > 27 and aa.age<= 35) AS age35,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age > 31 and aa.age<= 40) AS age35,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = #{communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age > 41 and aa.age<= 50) AS age45,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55,"
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age > 51 and aa.age<= 59) AS age55,"
         + "(SELECT COUNT(aa.age) FROM "
-        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age >= 60 and aa.age<= 79) AS age65,"
+        + "(SELECT COUNT(aa.age) FROM "
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age >= 80 and aa.age<= 89) AS age75,"
+        + "(SELECT COUNT(aa.age) FROM "
+        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age > 89) AS age55over")
     Map<String, Long> indexCountByAge(@Param("communityId") Long communityId);
 
     @Select("SELECT " + " id, " + " su.nick_name AS userName, " + " su.image_url, " + " caep.create_at, "
@@ -433,7 +457,7 @@
     EventNewStatisticsVO getEventScreenSSPDateil(@Param("eventId") Long eventId);
 
     @Select("SELECT " + " su.nick_name AS userName, " + " su.image_url AS imageUrl, " + " e.create_at as createAt, "
-        + " e.event_des, " + " e.event_clazz, " + " e.danger_level, " + " e.urgent, " + " e.major, "
+        + " e.event_des, " + " e.event_clazz, " + " e.danger_level, " + " e.urgent, " + " e.major,e.process_desc, "
         + " e.happen_address, " + " e.happent_lat_lng, " + " e.event_type, " + " e.event_category, " + " e.id, "
         + " egd.grid_name, " + " e.event_deal_status  " + "FROM " + " `event` AS e "
         + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id "
@@ -449,10 +473,10 @@
         + " LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id  " + "WHERE " + " e.id = #{eventId}")
     EventTransferRecordDetailVO getEventScreenEventTransDetail(@Param("eventId") Long eventId);
 
-    @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = #{communityId}")
+    @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = ${communityId}")
     EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);
 
-    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
+    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = ${communityId}")
     Integer getStatisticsCount(@Param("communityId") Long communityId);
 
     IPage<PopulationListVO> pagePopulationListApp(Page page,
@@ -538,7 +562,7 @@
         + "#{item}" + "</foreach>" + " </if> "
         + "<if test='populationExportDTO.isHouse != null and populationExportDTO.isHouse == 2'>"
         + "AND cmp.house_id is null " + " </if> " + "<if test='populationExportDTO.communityId != null'>"
-        + "AND cmpct.community_id = #{populationExportDTO.communityId} " + " </if> "
+        + "AND cmpct.community_id = ${populationExportDTO.communityId} " + " </if> "
         + "<if test='populationExportDTO.politicalOutlook != null'>"
         + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> " + " </script>")
     List<ComMngPopulationListVO>
@@ -647,4 +671,40 @@
     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);
+
+    /**
+     * 大屏30天內事件数据
+     * @param communityId
+     * @return
+     */
+    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);
+
+    /**
+     * 分页查询事件数据
+     * @param page
+     * @param pageBaseDTO
+     * @return
+     */
+    IPage<EventGridIncidentStatisticsVO> pageEventList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+    /**
+     * 大屏事件详情新处理方式
+     * @param eventId
+     * @return
+     */
+    EventNewStatisticsVO getEventScreenSSPDateilNew(@Param("eventId") Long eventId);
 }

--
Gitblit v1.7.1