From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |  671 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 605 insertions(+), 66 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 bb2c650..0cfe29a 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,6 +4,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.vos.area.AreaAddressVO;
 import com.panzhihua.common.model.vos.community.ComActMessageVO;
@@ -14,6 +20,12 @@
 import com.panzhihua.common.model.vos.community.screen.event.*;
 import com.panzhihua.common.model.vos.community.screen.index.*;
 import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.EventSpecialPopulationVO;
+import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
+import com.panzhihua.common.model.vos.grid.PopulationListVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngVillagePopulationListVO;
+import com.panzhihua.common.model.vos.grid.admin.PopulationStatisticsVO;
 import com.panzhihua.common.model.vos.user.*;
 import com.panzhihua.common.model.vos.community.PageComActMessageVO;
 import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
@@ -57,10 +69,12 @@
             "cmp.remark, " +
             "cmv.alley, " +
             "cmp.native_place, " +
+            "cmphu.relation, " +
             "cmp.nation  " +
             "FROM  " +
             "com_mng_population AS cmp " +
             "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
+            "LEFT JOIN com_mng_population_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
             "<where>" +
             "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != &quot;&quot;'>" +
             "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
@@ -112,6 +126,11 @@
             " where cmphu.house_id = #{houseId} and cmphu.popul_id != #{populId}")
     List<ComHouseMemberVo> listHouseMermberByUserId(@Param("houseId") Long houseId, @Param("populId") Long populId);
 
+    @Select("SELECT cmphu.popul_id,cmphu.relation,cmp.NAME,cmp.phone,cmp.healthy,cmp.card_no,cmp.work_company,cmp.birthday FROM com_mng_population_house_user cmphu " +
+            " LEFT JOIN com_mng_population cmp ON cmphu.popul_id = cmp.id " +
+            " WHERE cmphu.popul_id = #{populId}")
+    List<ComHouseMemberVo> listHouseMermberByPopuId(@Param("populId") Long populId);
+
     @Select("<script> " +
             "SELECT " +
             "cmp.`name`, " +
@@ -120,7 +139,6 @@
             "cmp.act_id, " +
             "cmp.village_id, " +
             "cmp.sex, " +
-            "cmp.age, " +
             "cmp.card_no, " +
             "cmp.road, " +
             "cmp.door_no, " +
@@ -132,11 +150,9 @@
             "cmp.special_situation, " +
             "cmp.phone, " +
             "cmp.remark, " +
-            "cmv.alley, " +
             "cmp.native_place, " +
             "cmp.nation,  " +
             "cmp.label,  " +
-            "cmp.relation,  " +
             "cmp.marriage,  " +
             "cmp.culture_level,  " +
             "cmp.out_or_local,  " +
@@ -144,13 +160,16 @@
             "cmp.healthy,  " +
             "cmp.birthday,  " +
             "cmp.update_at,  " +
+            "cmp.address,  " +
             "cmp.is_rent  " +
             "FROM  " +
             "com_mng_population AS cmp " +
-            "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_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 cmp.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
             " </if> " +
             "<if test='comMngPopulationVO.actId != null'>" +
             " and cmp.act_id = #{comMngPopulationVO.actId} " +
@@ -158,7 +177,7 @@
             "<if test='comMngPopulationVO.outOrLocal != null'>" +
             " and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " +
             " </if> " +
-            "<if test='comMngPopulationVO.villageId != null'>" +
+            "<if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != &quot;&quot;'>" +
             " and cmp.village_id = #{comMngPopulationVO.villageId} " +
             " </if> " +
             "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
@@ -176,17 +195,17 @@
             "<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != &quot;&quot;'>" +
             "AND cmp.house_no = #{comMngPopulationVO.houseNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != &quot;&quot;'>" +
-            "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
-            " </if> " +
             "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot; and comMngPopulationVO.ageEndTime == null'>" +
             "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ <= ]]> #{comMngPopulationVO.ageStartTime} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != &quot;&quot; and comMngPopulationVO.ageStartTime == null'>" +
             "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ >= ]]> #{comMngPopulationVO.ageEndTime} " +
+            " </if> " +
+            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime == comMngPopulationVO.ageEndTime'>" +
+            "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageStartTimeEnd} and #{comMngPopulationVO.ageEndTime}" +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
             "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
@@ -202,6 +221,9 @@
             " </if> " +
             "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
             "AND cmp.remark = #{comMngPopulationVO.remark} " +
+            " </if> " +
+            "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != &quot;&quot;'>" +
+            "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%')  " +
             " </if> " +
             " </where>" +
             " order by cmp.create_at desc" +
@@ -224,6 +246,15 @@
             "</script>")
     IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
 
+    @Select("<script> " +
+            "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag where community_id = #{comMngUserTagDTO.communityId}" +
+            "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != &quot;&quot;'>" +
+            " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " +
+            " </if> " +
+            " order by create_at desc " +
+            "</script>")
+    IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);
+
     @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
     UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
 
@@ -238,12 +269,13 @@
             "(select city_name from com_mng_struct_area_city where city_adcode = #{cityCode}) as city," +
             "(select district_name from com_mng_struct_area_district where district_adcode = #{districtCode}) as district" +
             "</script>")
-    AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode,@Param("cityCode") String cityCode,@Param("districtCode") String districtCode);
+    AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("districtCode") String districtCode);
 
     @Select("select count(id) as populationTotal " +
             ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 1) as localTotal " +
             ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
             ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
+            ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
             " from com_mng_population as cmp where act_id = #{communityId}")
     ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
 
@@ -284,7 +316,7 @@
             " egd.grid_community_id = #{communityId}  " +
             " AND e.event_deal_status IN ( 1, 4 )  " +
             "ORDER BY " +
-            " e.create_at DESC  " +
+            " e.happen_time DESC  " +
             " LIMIT 8")
     List<IndexEventListStatisticsVO> getScreenIndexByEventList(@Param("communityId") Long communityId);
 
@@ -305,18 +337,82 @@
 
     @Select("SELECT " +
             " count( e.id ) AS eventTFTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = egd.id ),0) AS eventZATotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = egd.id ),0) AS eventMDTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = egd.id ),0) AS eventTSTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = egd.id ),0) AS eventBWDTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = egd.id ),0) AS eventGGTotal  " +
+            " 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, " +
+            " 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}  " +
+            "   ), " +
+            "  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, " +
+            " 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 = 1  " +
+            "   AND event_type = 4  " +
+            "   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 " +
             " `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_deal_status in (1,2,3)  " +
             " AND e.event_status = 2  " +
             " AND egd.grid_community_id = #{communityId}")
     IndexGridEventStatisticsVO getGridEventStatisticsList(@Param("communityId") Long communityId);
@@ -326,17 +422,16 @@
 
     @Select("SELECT " +
             " count( e.id ) AS eventTFTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = e.grid_id ),0) AS eventZATotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = e.grid_id) ,0) AS eventMDTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = e.grid_id ),0) AS eventTSTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = e.grid_id ),0) AS eventBWDTotal, " +
-            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND event_deal_status in (1,2,3) AND grid_id = e.grid_id ),0) AS eventGGTotal  " +
+            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND grid_id = e.grid_id ),0) AS eventZATotal, " +
+            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND grid_id = e.grid_id) ,0) AS eventMDTotal, " +
+            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND grid_id = e.grid_id ),0) AS eventTSTotal, " +
+            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND grid_id = e.grid_id ),0) AS eventBWDTotal, " +
+            " IFNULL(( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND grid_id = e.grid_id ),0) AS eventGGTotal  " +
             "FROM " +
             " `event` AS e " +
             "WHERE " +
             " e.event_category = 1  " +
             " AND e.event_type = 5  " +
-            " AND e.event_deal_status in (1,2,3)  " +
             " AND e.event_status = 2  " +
             " AND e.grid_id = #{gridId}")
     IndexGridEventStatisticsVO getGridEventByGirdId(@Param("gridId") Long gridId);
@@ -359,7 +454,8 @@
             " label like concat('%',#{label},'%')")
     Integer getSpecialStatisticsByLabel(@Param("label") String label);
 
-    @Select("SELECT " +
+    @Select("<script> " +
+            "SELECT " +
             " count( egd.id ) AS gridTotal, " +
             " ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
             " ( " +
@@ -371,6 +467,12 @@
             " WHERE " +
             "  egd1.grid_community_id = egd.grid_community_id  " +
             "  AND event_status = 2  " +
+            "<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;'>" +
+            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             " ) AS eventTotal, " +
             " ( " +
             " SELECT " +
@@ -381,6 +483,12 @@
             " WHERE " +
             "  egd2.grid_community_id = egd.grid_community_id  " +
             "  AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " 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> " +
             " AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
             " ( " +
             " SELECT " +
@@ -392,12 +500,20 @@
             "  egd2.grid_community_id = egd.grid_community_id  " +
             "  AND event_status = 2  " +
             "  AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " 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 = #{communityId}")
-    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
+            " egd.grid_community_id = #{screenEventDTO.communityId} " +
+            " </script>")
+    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
 
     @Select("SELECT " +
             " DATE_FORMAT( e.create_at, '%m' ) months  " +
@@ -415,7 +531,8 @@
             " LIMIT 3")
     List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
 
-    @Select("SELECT " +
+    @Select("<script> " +
+            "SELECT " +
             " count( e.id ) AS eventZATotal, " +
             " IFNULL(( " +
             "  SELECT " +
@@ -424,10 +541,16 @@
             "   `event` AS e1 " +
             "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  " +
             "  WHERE " +
-            "   egd1.grid_community_id = #{communityId}  " +
+            "   egd1.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 1  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " 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> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventZATotal, " +
@@ -438,10 +561,16 @@
             "   `event` AS e2 " +
             "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " +
             "  WHERE " +
-            "   egd2.grid_community_id = #{communityId}  " +
+            "   egd2.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 5  " +
             "   AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS eventTFTotal, " +
@@ -452,10 +581,16 @@
             "   `event` AS e3 " +
             "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " +
             "  WHERE " +
-            "   egd3.grid_community_id = #{communityId}  " +
+            "   egd3.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 5  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventTFTotal, " +
@@ -466,10 +601,16 @@
             "   `event` AS e4 " +
             "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " +
             "  WHERE " +
-            "   egd4.grid_community_id = #{communityId}  " +
+            "   egd4.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 6  " +
             "   AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS eventTSTotal, " +
@@ -480,10 +621,16 @@
             "   `event` AS e5 " +
             "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " +
             "  WHERE " +
-            "   egd5.grid_community_id = #{communityId}  " +
+            "   egd5.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 6  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventTSTotal, " +
@@ -494,10 +641,16 @@
             "   `event` AS e6 " +
             "   LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id  " +
             "  WHERE " +
-            "   egd6.grid_community_id = #{communityId}  " +
+            "   egd6.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 3  " +
             "   AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS eventMDTotal, " +
@@ -508,10 +661,16 @@
             "   `event` AS e7 " +
             "   LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id  " +
             "  WHERE " +
-            "   egd7.grid_community_id = #{communityId}  " +
+            "   egd7.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 3  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventMDTotal, " +
@@ -522,10 +681,16 @@
             "   `event` AS e8 " +
             "   LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id  " +
             "  WHERE " +
-            "   egd8.grid_community_id = #{communityId}  " +
+            "   egd8.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 4  " +
             "   AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS eventBWDTotal, " +
@@ -536,10 +701,16 @@
             "   `event` AS e9 " +
             "   LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id  " +
             "  WHERE " +
-            "   egd9.grid_community_id = #{communityId}  " +
+            "   egd9.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 4  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventBWDTotal, " +
@@ -550,10 +721,16 @@
             "   `event` AS e10 " +
             "   LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id  " +
             "  WHERE " +
-            "   egd10.grid_community_id = #{communityId}  " +
+            "   egd10.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 2  " +
             "   AND event_status = 2  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS eventGGTotal, " +
@@ -564,29 +741,55 @@
             "   `event` AS e11 " +
             "   LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id  " +
             "  WHERE " +
-            "   egd11.grid_community_id = #{communityId}  " +
+            "   egd11.grid_community_id = #{screenEventDTO.communityId}  " +
             "   AND event_category = 1  " +
             "   AND event_type = 2  " +
             "   AND event_deal_status = 4  " +
+            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
+            " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
+            " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
             "   ), " +
             "  0  " +
             " ) AS yesEventGGTotal, " +
-            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{communityId} ), 0 ) AS eventSSPTotal, " +
-            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal  " +
+            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND 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;'>" +
+            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
+            "), 0 ) AS eventSSPTotal, " +
+            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND 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;'>" +
+            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
+            "), 0 ) AS yesEventSSPTotal  " +
             "FROM " +
             " `event` AS e " +
             " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " +
             "WHERE " +
-            " egd.grid_community_id = #{communityId}  " +
-            " AND event_category = 1  " +
-            " AND event_type = 1  " +
-            " AND event_status = 2")
-    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
+            " egd.grid_community_id = #{screenEventDTO.communityId}  " +
+            " AND event_status = 2 " +
+            "<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;'>" +
+            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
+            " </script>")
+    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
 
     @Select("SELECT " +
             " su.nick_name AS userName, " +
             " su.image_url AS imageUrl, " +
-            " e.create_at, " +
+            " e.happen_time as createAt, " +
             " e.event_des, " +
             " e.danger_level, " +
             " e.urgent, " +
@@ -606,7 +809,7 @@
             " AND e.event_deal_status = 1  " +
             " AND e.event_category = 1  " +
             "ORDER BY " +
-            " e.create_at DESC  " +
+            " e.happen_time DESC  " +
             " LIMIT 1")
     EventNewStatisticsVO getEventScreenRightTop(@Param("communityId") Long communityId);
 
@@ -623,8 +826,10 @@
             " egd.grid_community_id = #{communityId}")
     List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
 
-    @Select("SELECT " +
+    @Select("<script> " +
+            "SELECT " +
             " event_type AS type, " +
+            " e.id AS eventId, " +
             " happent_lat_lng AS latLng  " +
             "FROM " +
             " `event` AS e " +
@@ -633,23 +838,42 @@
             " e.event_category = 1  " +
             " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " +
             " AND e.event_status = 2  " +
-            " AND e.event_deal_status = 1  " +
-            " AND egd.grid_community_id = #{communityId}  " +
-            " AND e.happen_time BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY )  " +
-            " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH ) UNION ALL " +
-            "SELECT " +
+            " 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;'>" +
+            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.eventProcessStatus != null'>" +
+            " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " +
+            " </if> " +
+            "<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  " +
             "FROM " +
             " com_act_easy_photo  " +
             "WHERE " +
-            " community_id = #{communityId}  " +
-            " AND handle_status = 1  " +
-            " AND del_tag = 0  " +
-            " AND lng_lat IS NOT NULL  " +
-            " AND create_at BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY )  " +
-            " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH )")
-    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);
+            " 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;'>" +
+            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
+            " </if> " +
+            "<if test='screenEventDTO.eventProcessStatus != null'>" +
+            " AND handle_status = #{screenEventDTO.eventProcessStatus} " +
+            " </if> " +
+            " </script>")
+    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
 
     @Select("SELECT " +
             " count( id ) AS specialTotal, " +
@@ -659,7 +883,7 @@
             "WHERE " +
             " label IS NOT NULL  " +
             " AND act_id = #{communityId}")
-    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,@Param("lastMonth") Date lastMonth);
+    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId, @Param("lastMonth") Date lastMonth);
 
     @Select("SELECT `NAME`, " +
             " user_sum, " +
@@ -673,8 +897,19 @@
             " community_id = #{communityId}")
     List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
 
+    @Select("SELECT " +
+            " count( id ) AS peopleNum, " +
+            " ( SELECT count( id ) FROM com_mng_population_house AS cmph WHERE village_id = #{villageId} ) AS houseNum, " +
+            " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 1 ) AS registerNum, " +
+            " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 2 ) AS flowNum  " +
+            "FROM " +
+            " com_mng_population AS cmp  " +
+            "WHERE " +
+            " village_id = #{villageId}")
+    CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);
 
-	@Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
+
+    @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
     Map<String, Long> countBySex(@Param("communityId") Long communityId);
 
     @Select(
@@ -691,7 +926,7 @@
                     "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55," +
                     "(SELECT COUNT(aa.age) FROM " +
                     "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
-    Map<String, Long> countByAge(@Param("communityId")Long communityId);
+    Map<String, Long> countByAge(@Param("communityId") Long communityId);
 
     @Select("SELECT COUNT(id)AS xx," +
             "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 2 AND act_id = #{communityId}) as cz," +
@@ -703,9 +938,313 @@
             "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 8 AND act_id = #{communityId}) as bs," +
             "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 9 AND act_id = #{communityId}) as qt" +
             " FROM com_mng_population WHERE culture_level = 1 AND act_id = #{communityId}")
-    Map<String, Long> countByCulture(@Param("communityId")Long communityId);
+    Map<String, Long> countByCulture(@Param("communityId") Long communityId);
 
     @Select("select count(user_id) from sys_user where community_id = #{communityId} and type = 1")
-    Long countUsedCommunityPopulation(@Param("communityId")Long communityId);
+    Long countUsedCommunityPopulation(@Param("communityId") Long communityId);
+
+    @Select(
+            "SELECT " +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) as aa where aa.age<= 16) as age16," +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 16 and aa.age<= 27) AS age27," +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 27 and aa.age<= 35) AS age35," +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45," +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55," +
+                    "(SELECT COUNT(aa.age) FROM " +
+                    "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
+    Map<String, Long> indexCountByAge(@Param("communityId") Long communityId);
+
+
+    @Select("SELECT " +
+            " id, " +
+            " su.nick_name AS userName, " +
+            " su.image_url, " +
+            " caep.create_at, " +
+            " caep.detail AS eventDes, " +
+            " caep.happen_addr AS happenAddress, " +
+            " caep.lng_lat AS happentLatLng, " +
+            " caep.photo_path_list, " +
+            " IFNULL( NULL, 7 ) AS eventType, " +
+            " caep.handle_status AS eventDealStatus  " +
+            "FROM " +
+            " com_act_easy_photo AS caep " +
+            " LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id  " +
+            "WHERE " +
+            " id = #{eventId}")
+    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.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 " +
+            " LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id  " +
+            "WHERE " +
+            " e.id = #{eventId}")
+    EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);
+
+    @Select("select process_date,process_result,process_type,from_type,from_id,from_name,event_id from event_transfer_record where event_id = #{eventId}")
+    List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);
+
+    @Select("SELECT " +
+            " cs.address AS streetName, " +
+            " ca.`name` AS communityName, " +
+            " egd.grid_name  " +
+            "FROM " +
+            " `event` AS e " +
+            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
+            " LEFT JOIN com_act AS ca ON egd.grid_community_id = ca.community_id " +
+            " 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}")
+    EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);
+
+    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
+    Integer getStatisticsCount(@Param("communityId") Long communityId);
+
+    @Select("<script> " +
+            "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
+            ",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
+            " where cmp.act_id = #{populationListDTO.communityId}" +
+            "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>" +
+            "AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%'))  " +
+            " </if> " +
+            "<if test='populationListDTO.label != null and populationListDTO.label != &quot;&quot;'>" +
+            "AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +
+            " </if> " +
+            " </script>")
+    IPage<PopulationListVO> pagePopulationListApp(Page page, @Param("populationListDTO") PagePopulationListDTO populationListDTO);
+
+    @Select("SELECT " +
+            " cmp.id, " +
+            " cmp.`name`, " +
+            " cmp.phone, " +
+            " cmp.card_no, " +
+            " cmp.label, " +
+            " cmp.address, " +
+            " cmp.nation, " +
+            " cmp.political_outlook, " +
+            " cmp.sex, " +
+            " cmp.birthday, " +
+            " cmp.native_place, " +
+            " cmp.healthy, " +
+            " cmp.is_rent, " +
+            " cmv.alley AS road, " +
+            " cmv.house_num AS doorNo, " +
+            " cmp.floor, " +
+            " cmp.unit_no, " +
+            " cmp.house_no, " +
+            " cmp.work_company, " +
+            " cmp.census_register, " +
+            " cmp.out_or_local, " +
+            " cmp.remark, " +
+            " cmp.marriage " +
+            "FROM " +
+            " com_mng_population AS cmp " +
+            " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id  " +
+            "WHERE " +
+            " id = #{populationId}")
+    PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);
+
+    @Select("<script> " +
+            "SELECT " +
+            " *  " +
+            "FROM " +
+            " ( " +
+            " SELECT " +
+            " cmp.id, " +
+            "  cmp.`name` AS userName, " +
+            "  cmp.label, " +
+            "  cmp.card_no, " +
+            "  cmp.card_no_str, " +
+            "  cmp.sex, " +
+            "  cmp.address, " +
+            "  cmp.political_outlook, " +
+            "  cmp.census_register, " +
+            "  cmp.house_id, " +
+            "  cmp.phone, " +
+            "  IFNULL(cmp.house_id,0) as isHouse, " +
+            "  ( SELECT event_status FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS eventStatus, " +
+            "  ( SELECT create_at FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS createAt " +
+            " FROM " +
+            " com_mng_population AS cmp where 1=1 " +
+            "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>" +
+            "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%') or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
+            " </if> " +
+            "<if test='populationListDTO.label != null and populationListDTO.label != &quot;&quot;'>" +
+            "AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +
+            " </if> " +
+            "<if test='populationListDTO.sex != null'>" +
+            "AND cmp.sex = #{populationListDTO.sex} " +
+            " </if> " +
+            "<if test='populationListDTO.isHouse != null and populationListDTO.isHouse == 1'>" +
+            "AND cmp.house_id is not null " +
+            " </if> " +
+            "<if test='populationListDTO.isHouse != null and populationListDTO.isHouse == 2'>" +
+            "AND cmp.house_id is null " +
+            " </if> " +
+            "<if test='populationListDTO.communityId != null'>" +
+            "AND cmp.act_id = #{populationListDTO.communityId} " +
+            " </if> " +
+            "<if test='populationListDTO.politicalOutlook != null'>" +
+            "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " +
+            " </if> " +
+            " ) as population where 1=1 " +
+            "<if test='populationListDTO.eventStatus != null'>" +
+            "AND population.eventStatus = #{populationListDTO.eventStatus} " +
+            " </if> " +
+            " </script>")
+    IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page, @Param("populationListDTO") ComMngPopulationListDTO populationListDTO);
+
+    @Select("select relation from com_mng_population_house_user where house_id = #{houseId} and popul_id = #{populationId}")
+    Integer getPopulationRelationByHouseId(@Param("houseId") Long houseId, @Param("populationId") Long populationId);
+
+    @Select("<script>" +
+            " select count(id) from event_visiting_tasks as evt where visiter_id in " +
+            "<foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >" +
+            "#{id}" +
+            "</foreach>" +
+            " </script>")
+    Integer getPopulationVisitingCount(@Param("ids") List<Long> ids);
+
+    @Select("<script> " +
+            "SELECT " +
+            "   cmp.id, " +
+            "   cmp.`name`, " +
+            "   cmp.card_no as idCard, " +
+            "   cmp.label, " +
+            "   cmp.sex, " +
+            "   IFNULL( cmp.phone, '暂无' ) as phone, " +
+            "   cmp.address, " +
+            "   cmp.political_outlook " +
+            "  FROM " +
+            "   com_mng_population AS cmp where 1=1 " +
+            "<if test='populationDTO.keyWord != null'>" +
+            " AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
+            " </if> " +
+            "<if test='populationDTO.populationIds != null and populationDTO.populationIds.size > 0'>" +
+            " AND cmp.id not in " +
+            "<foreach collection='populationDTO.populationIds' item='id' index='index' open='(' close=')' separator=',' >" +
+            "#{id}" +
+            "</foreach>" +
+            " </if> " +
+            " </script>")
+    IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page, @Param("populationDTO") PageComMngPopulationDTO populationDTO);
+
+    @Select("<script> " +
+            "SELECT " +
+            " count( id ) AS localNum, " +
+            " ( SELECT count( id ) FROM com_mng_population WHERE out_or_local = 2 " +
+            "<if test='communityId != null and communityId != 0'>" +
+            " AND act_id = #{communityId} " +
+            " </if> " +
+            " ) AS flowNum, " +
+            " ( SELECT count( id ) FROM com_mng_population WHERE label IS NOT NULL " +
+            "<if test='communityId != null and communityId != 0'>" +
+            " AND act_id = #{communityId} " +
+            " </if> " +
+            " ) AS specialNum  " +
+            "FROM " +
+            " com_mng_population  " +
+            "WHERE " +
+            " out_or_local = 1 " +
+            "<if test='communityId != null and communityId != 0'>" +
+            " AND act_id = #{communityId} " +
+            " </if> " +
+            " </script>")
+    PopulationStatisticsVO getGridPopulationStatistics(@Param("communityId") Long communityId);
+
+    @Select("<script> " +
+            "SELECT " +
+            " *  " +
+            "FROM " +
+            " ( " +
+            " SELECT " +
+            " cmp.id, " +
+            "  cmp.`name` AS userName, " +
+            "  cmp.label, " +
+            "  cmp.card_no, " +
+            "  cmp.card_no_str, " +
+            "  cmp.sex, " +
+            "  cmp.address, " +
+            "  cmp.political_outlook, " +
+            "  cmp.census_register, " +
+            "  cmp.house_id, " +
+            "  cmp.phone, " +
+            "  IFNULL(cmp.house_id,0) as isHouse, " +
+            "  ( SELECT event_status FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS eventStatus, " +
+            "  ( SELECT create_at FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS createAt " +
+            " FROM " +
+            " com_mng_population AS cmp where 1=1 " +
+            "<if test='populationExportDTO.keyWord != null and populationExportDTO.keyWord != &quot;&quot;'>" +
+            "AND (cmp.name like concat (#{populationExportDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationExportDTO.keyWord},'%') or cmp.address like concat (#{populationExportDTO.keyWord},'%')) " +
+            " </if> " +
+            "<if test='populationExportDTO.label != null and populationExportDTO.label != &quot;&quot;'>" +
+            "AND cmp.label like concat ('%',#{populationExportDTO.label},'%') " +
+            " </if> " +
+            "<if test='populationExportDTO.sex != null'>" +
+            "AND cmp.sex = #{populationExportDTO.sex} " +
+            " </if> " +
+            "<if test='populationExportDTO.isHouse != null and populationExportDTO.isHouse == 1'>" +
+            "AND cmp.house_id is not null " +
+            " </if> " +
+            "<if test='populationExportDTO.populationIds != null and populationExportDTO.populationIds.size > 0'>" +
+            "AND cmp.id in  " +
+            "<foreach item='item' collection='populationExportDTO.populationIds' separator=',' open='(' close=')' index=''>" +
+            "#{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 cmp.act_id = #{populationExportDTO.communityId} " +
+            " </if> " +
+            "<if test='populationExportDTO.politicalOutlook != null'>" +
+            "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " +
+            " </if> " +
+            " ) as population where 1=1 " +
+            "<if test='populationExportDTO.eventStatus != null'>" +
+            "AND population.eventStatus = #{populationExportDTO.eventStatus} " +
+            " </if> " +
+            " </script>")
+    List<ComMngPopulationListVO> getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);
+
+    @Select("<script> " +
+            " select id,`name`,card_no,label from com_mng_population where 1=1 " +
+            "<if test='villagePopulationDTO.villageId != null'>" +
+            " and village_id = #{villagePopulationDTO.villageId} " +
+            " </if> " +
+            "<if test='villagePopulationDTO.keyWord != null'>" +
+            " AND (name like concat (#{villagePopulationDTO.keyWord},'%') or card_no_str like concat (#{villagePopulationDTO.keyWord},'%'))  " +
+            " </if> " +
+            "<if test='villagePopulationDTO.label != null and villagePopulationDTO.label != &quot;&quot;'>" +
+            " AND label like concat ('%',#{villagePopulationDTO.label},'%')  " +
+            " </if> " +
+            " </script>")
+    IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);
 
 }
+

--
Gitblit v1.7.1