From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 04e2361..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
@@ -117,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'>"
@@ -150,6 +152,13 @@
      * @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> "
@@ -418,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);
@@ -597,4 +606,13 @@
      * 居民详情
      */
     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