From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |  269 +++++++++++++++++++----------------------------------
 1 files changed, 99 insertions(+), 170 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 22b0360..fa09f6b 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,10 @@
 import java.util.List;
 import java.util.Map;
 
+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.service_community.model.dos.ComMngPopulationCommunityTagsDO;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,8 +25,6 @@
 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.ComMngPopulationTotalVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
 import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
 import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
 import com.panzhihua.common.model.vos.community.screen.event.*;
@@ -115,6 +117,8 @@
         + "AND cmp.unit_no = #{comMngPopulationVO.unitNo} " + " </if> "
         + "<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != &quot;&quot;'>"
         + "AND cmp.house_no = #{comMngPopulationVO.houseNo} " + " </if> "
+        + "<if test='comMngPopulationVO.isDeath != null'>"
+        + "AND cmp.death = #{comMngPopulationVO.isDeath} " + " </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; and comMngPopulationVO.ageEndTime == null'>"
@@ -141,24 +145,25 @@
     IPage<ComMngPopulationVO> pagePopulation(Page page,
         @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO);
 
-    @Select("<script> "
-        + "select cmp.id,cmv.`alley` as areaName,cmp.`name`,cmp.phone,cmp.label as tags,cmp.create_at 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_community_tags as cmpct on cmp.id = cmpct.population_id "
-        + "where cmpct.community_id = #{pageInputUserDTO.communityId} and cmpct.label is not null "
-        + "<if test='pageInputUserDTO.name != null and pageInputUserDTO.name != &quot;&quot;'>"
-        + " AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " + " </if> "
-        + "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != &quot;&quot;'>"
-        + " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " + " </if> "
-        + "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != &quot;&quot;'>"
-        + " AND cmpct.label like concat('%',#{pageInputUserDTO.tags},'%') " + " </if> "
-        + " order by cmp.create_at desc " + "</script>")
+    /**
+     * 分页查询特殊群体列表
+     * @param page  分页参数
+     * @param pageInputUserDTO  请求参数
+     * @return  特殊群体列表
+     */
     IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
 
+    /**
+     *
+     * @param pageInputUserDTO
+     * @return
+     */
+    List<InputUserInfoVO> specialInputUserExport(@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}"
+        + "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag <where> "
         + "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != &quot;&quot;'>"
-        + " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " + " </if> " + " order by create_at desc "
+        + " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " + " </if> " + "</where>" + " order by create_at desc "
         + "</script>")
     IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);
 
@@ -179,27 +184,29 @@
     AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode,
         @Param("districtCode") String districtCode);
 
-    @Select("select count(id) as populationTotal "
+    @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(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal "
+        + ",(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 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 "
-        + " from com_mng_population_community_tags as cmpct where community_id = #{communityId}")
+        + ",(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}")
     ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
 
     @Select("select count(id) as populationTotal," +
             "IFNULL((select count(id) from com_mng_population_house where community_id = cmpct.community_id),0) as houseTotal, " +
             "IFNULL((select count(id) from com_mng_real_company where community_id = cmpct.community_id),0) as companyTotal, " +
-            "IFNULL((select count(village_id) from com_mng_village where community_id = cmpct.community_id),0) as villageTotal " +
+            "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}")
     IndexBasicsStatisticsVO getScreenIndexByBasics(@Param("communityId") Long communityId);
@@ -242,8 +249,8 @@
         + "   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}  "
+        + "   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}  "
         + "   ), " + "  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  "
@@ -275,7 +282,8 @@
     Integer getSpecialStatisticsByLabel(@Param("label") String label,@Param("communityId") Long communityId);
 
     @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, "
+        + " ( select count(egmr.id) from event_grid_member_relation as egmr"
+        + " left join event_grid_data as egd1 on egd1.id = egmr.grid_id where egd1.grid_community_id = egd.grid_community_id ) AS gridMemberTotal, "
         + " ( " + " SELECT " + "  count( e.id )  " + " FROM " + "  `event` AS e "
         + "  LEFT JOIN event_grid_data AS egd1 ON e.grid_id = egd1.id  " + " WHERE "
         + "  egd1.grid_community_id = egd.grid_community_id  " + "  AND event_status = 2  "
@@ -309,112 +317,11 @@
         + "GROUP BY " + " months  " + "ORDER BY " + " count( e.id ) DESC  " + " LIMIT 3")
     List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
 
-    @Select("<script> " + "SELECT " + " count( e.id ) AS eventZATotal, " + " IFNULL(( " + "  SELECT "
-        + "   count( e1.id )  " + "  FROM " + "   `event` AS e1 "
-        + "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e2.id )  " + "  FROM "
-        + "   `event` AS e2 " + "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e3.id )  " + "  FROM " + "   `event` AS e3 "
-        + "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e4.id )  " + "  FROM "
-        + "   `event` AS e4 " + "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e5.id )  " + "  FROM " + "   `event` AS e5 "
-        + "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e6.id )  " + "  FROM "
-        + "   `event` AS e6 " + "   LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e7.id )  " + "  FROM " + "   `event` AS e7 "
-        + "   LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e8.id )  " + "  FROM "
-        + "   `event` AS e8 " + "   LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e9.id )  " + "  FROM " + "   `event` AS e9 "
-        + "   LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e10.id )  " + "  FROM "
-        + "   `event` AS e10 " + "   LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id  " + "  WHERE "
-        + "   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, " + " IFNULL(( " + "  SELECT " + "   count( e11.id )  " + "  FROM "
-        + "   `event` AS e11 " + "   LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id  " + "  WHERE "
-        + "   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 = #{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 status = 4 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 = #{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>")
+    /**
+     * 综治事件大屏统计数据
+     * @param screenEventDTO    请求参数
+     * @return 大屏统计数据
+     */
     EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
 
     @Select("SELECT " + " su.nick_name AS userName, " + " su.image_url AS imageUrl, " + " e.happen_time as createAt, "
@@ -520,7 +427,7 @@
 
     @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  "
+        + " caep.photo_path_list, " + " IFNULL( NULL, 7 ) AS eventType, " + " caep.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);
@@ -548,48 +455,29 @@
     @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,cmpct.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 "
-        + " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  "
-        + " where cmpct.community_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 cmpct.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, " + " cmpct.label, "
-        + " cmp.address, " + " cmp.culture_level, " + " 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  "
-        + " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  " + "WHERE "
-        + " id = #{populationId}")
+    /**
+     * 根据人口id查询人口详情
+     * @param populationId  人口id
+     * @return  人口详情
+     */
     PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);
 
-    @Select("<script> " + " SELECT " + " cmp.id, " + "  cmp.`name` AS userName, "
-        + "  cmpct.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 left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id where 1=1 "
-        + "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>"
-        + "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no = #{populationListDTO.cardNo} or cmp.address like concat (#{populationListDTO.keyWord},'%')) "
-        + " </if> " + "<if test='populationListDTO.label != null and populationListDTO.label != &quot;&quot;'>"
-        + "AND cmpct.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 cmpct.community_id = #{populationListDTO.communityId} " + " </if> "
-        + "<if test='populationListDTO.politicalOutlook != null'>"
-        + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> " + " </script>")
+    /**
+     * 根据人口id查询人口在各个社区的标签列表
+     * @param populationId  人口id
+     * @return  人口在各个社区的标签列表
+     */
+    List<ComMngPopulationCommunityTagsVo> getCommunityTagList(@Param("populationId") Long populationId);
+
+    /**
+     * 综治后台-分页查询居民列表
+     * @param page  分页参数
+     * @param populationListDTO 请求参数
+     * @return  居民列表
+     */
     IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page,
         @Param("populationListDTO") ComMngPopulationListDTO populationListDTO);
 
@@ -600,6 +488,12 @@
         + "<foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >" + "#{id}"
         + "</foreach>" + " </script>")
     Integer getPopulationVisitingCount(@Param("ids") List<Long> ids);
+
+    /**
+     * 综治后台删除居民,并清理人口与社区绑定关系
+     * @param ids   需要删除的人口id集合
+     */
+    void deletePopulaitonRelation(@Param("ids") List<Long> ids);
 
     @Select("<script> " + "SELECT " + "   cmp.id, " + "   cmp.`name`, " + "   cmp.card_no as idCard, "
         + "   cmpct.label, " + "   cmp.sex, " + "   IFNULL( cmp.phone, '暂无' ) as phone, " + "   cmp.address, "
@@ -615,7 +509,7 @@
         @Param("populationDTO") PageComMngPopulationDTO populationDTO);
 
     @Select("<script> " + "SELECT " + " count( id ) AS localNum, "
-        + " ( SELECT count( cmpct.id ) FROM com_mng_population as cmp WHERE cmp.out_or_local = 2 "
+        + " ( SELECT count( cmp.id ) FROM com_mng_population as cmp WHERE cmp.out_or_local = 2 "
         +  " ) AS flowNum, "
         + " ( SELECT count( cmpct.id ) FROM com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL "
         + " ) AS specialNum  " + "FROM "
@@ -651,7 +545,7 @@
         getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);
 
     @Select("<script> "
-        + " select cmp.id,cmp.`name`,cmp.card_no,cmtct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
+        + " select cmp.id,cmp.`name`,cmp.card_no,cmpct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
         + "<if test='villagePopulationDTO.villageId != null'>"
         + " and cmp.village_id = #{villagePopulationDTO.villageId} " + " </if> "
         + "<if test='villagePopulationDTO.keyWord != null'>"
@@ -686,4 +580,39 @@
 
     void updateAll(@Param("populationList") List<ComMngPopulationDO> populationList);
 
+    /**
+     * 房屋二级联动
+     * @param communityId
+     * @return
+     */
+    List<VillageVO> getSecondHouseAddress(Long communityId);
+
+    /**
+     * 房屋二级联动后台
+     * @param communityId
+     * @return
+     */
+    List<VillageVO> getSecondHouse(Long communityId);
+
+    /**
+     * 四长四员分页查询
+     * @param page
+     * @param commonPage
+     * @return
+     */
+    IPage<ComMngPopulationNoSecretVO> query(Page page, @Param("commonPage") CommonPage commonPage);
+
+    /**
+     * 居民详情
+     */
+    ComMngPopulationDetailVO getById(Long id);
+
+    /**
+     * 修改实有人口绑定单元号
+     * @param villageId 小区id
+     * @param floor 楼栋号
+     * @param oldUnitNo 原单元号
+     * @param newUnitNo 新单元号
+     */
+    void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);
 }

--
Gitblit v1.7.1