From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
index 068598f..3d7862b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -9,8 +9,11 @@
 import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO;
 import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
 import com.panzhihua.common.model.vos.grid.PopulationListVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngSubordinateVO;
 import com.panzhihua.common.model.vos.user.ComMngHouseVo;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -25,14 +28,14 @@
 @Mapper
 public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> {
 
-    @Select("select cmphu.house_id,cmph.address,cmph.status from com_mng_population_house_user cmphu " +
+    @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu " +
             " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id " +
             " where cmphu.popul_id = #{populId}")
     List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId")Long populId);
 
     @Select("<script> " +
             "select id as houseId,cmv.alley from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId}" +
-            "<if test='villageId != null'>" +
+            "<if test='villageId != null and villageId != &quot;&quot;'>" +
             "and cmv.village_id = #{villageId}" +
             " </if> " +
             " </script>")
@@ -141,7 +144,7 @@
             " AND cmv.alley = #{populationHouseAdminDTO.road}  " +
             " </if> " +
             "<if test='populationHouseAdminDTO.doorNo != null and populationHouseAdminDTO.doorNo != &quot;&quot; '>" +
-            " AND cmv.houseNum = #{populationHouseAdminDTO.doorNo}  " +
+            " AND cmv.house_num = #{populationHouseAdminDTO.doorNo}  " +
             " </if> " +
             "<if test='populationHouseAdminDTO.floor != null and populationHouseAdminDTO.floor != &quot;&quot; '>" +
             " AND cmph.floor = #{populationHouseAdminDTO.floor}  " +
@@ -154,6 +157,9 @@
             " </if> " +
             "<if test='populationHouseAdminDTO.villageId != null'>" +
             " and cmph.village_id = #{populationHouseAdminDTO.villageId} " +
+            " </if> " +
+            "<if test='populationHouseAdminDTO.address != null and populationHouseAdminDTO.address != &quot;&quot; '>" +
+            " AND cmph.address = #{populationHouseAdminDTO.address}  " +
             " </if> " +
             " </where>" +
             " order by update_at desc" +
@@ -221,7 +227,7 @@
             " cmphu.id as housePopulationId, " +
             " cmp.sex, " +
             " cmp.`name`, " +
-            " cmp.phone, " +
+            " IFNULL( cmp.phone, '暂无' ) as phone, " +
             " cmp.card_no, " +
             " cmp.label, " +
             " cmp.address, " +
@@ -242,4 +248,27 @@
             " </script>")
     List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,@Param("relation") Integer relation,@Param("relationId") Integer relationId);
 
+    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} order by create_at asc")
+    List<ComMngSubordinateVO> getHouseLevelByFloors(@Param("villageId") Long villageId);
+
+    @Select("select id as houseId,unit_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} order by create_at asc")
+    List<ComMngSubordinateVO> getHouseLevelByUnitNos(@Param("villageId") Long villageId,@Param("floor") String floor);
+
+    @Select("select id as houseId,house_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no = #{unitNo} order by create_at asc")
+    List<ComMngSubordinateVO> getHouseLevelByHouseNos(@Param("villageId") Long villageId,@Param("floor") String floor,@Param("unitNo") String unitNo);
+
+    @Insert("<script> " +
+            "insert into com_mng_population_house(`id`,`street_id`,`community_id`,`village_id`" +
+            ",`alley`,`house_num`,`unit_no`,`floor`,`house_no`,`code`,`address`,`status`" +
+            ",`purpose`,`control_status`,`is_empty`,`construct_purpose`,`construct_area`" +
+            ",`path`,`create_at`) values " +
+            "<foreach collection=\"houseList\" item=\"item\" index=\"index\" separator=\",\">\n" +
+            "        (#{item.id},#{item.streetId},#{item.communityId},#{item.villageId}" +
+            ",#{item.alley},#{item.houseNum},#{item.unitNo},#{item.floor}" +
+            ",#{item.houseNo},#{item.code},#{item.address},#{item.status}" +
+            ",#{item.purpose},#{item.controlStatus},#{item.isEmpty},#{item.constructPurpose}" +
+            ",#{item.constructArea},#{item.path},now())" +
+            "    </foreach>" +
+            " </script>")
+    void insertAll(@Param("houseList") List<ComMngPopulationHouseDO> houseList);
 }

--
Gitblit v1.7.1