From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 224a0bd..5d8622b 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
@@ -11,7 +11,9 @@
 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;
@@ -26,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.popul_id,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>")
@@ -142,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}  " +
@@ -155,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" +
@@ -251,4 +256,19 @@
 
     @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