From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
index 34a61b0..33bf9fe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
@@ -37,7 +37,7 @@
List<Long> getPopulationHouseIdByhHosueId(@Param("houseId") Long houseId);
@Select("select cmp.id,cmp.name,cmp.card_no,cmp.phone from com_mng_population_house_user as cmphu "
- + "left join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}")
+ + "inner join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}")
List<ComMngPopulationHouseUserAdminVO> getHouseUserByHouseId(@Param("houseId") Long houseId);
@Select("update com_mng_population_house_user set relation = null where id = #{id}")
@@ -46,7 +46,7 @@
@Select("update com_mng_population_house_user set relation_id = null where id = #{id}")
Integer delBuildingHousePopulationRelationId(@Param("id") Long id);
- @Select("SELECT " + " cmv.`name` AS villageName, " + " cmph.id, " + " cmv.address, " + " cmph.floor, "
+ @Select("SELECT " + " cmv.`name` AS villageName, " + " cmph.id, " + " cmv.address, " + " cmph.floor,cmphu.relation, "
+ " cmph.unit_no, " + " cmph.house_no " + "FROM " + " com_mng_population_house_user AS cmphu "
+ " LEFT JOIN com_mng_population_house AS cmph ON cmph.id = cmphu.house_id "
+ " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmph.village_id " + "WHERE "
@@ -67,4 +67,17 @@
+ " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id "
+ " where cmphu.id = #{id}")
ComMngHouseVo detail(Long id);
+
+ /**
+ * 查询指定人员是否存在租住的数量
+ * @param ids 指定实有人口
+ * @return 存在租住的数量
+ */
+ Integer getHouseUserIsRent(@Param("ids") List<Long> ids);
+
+ /**
+ * 索引查询
+ * @return
+ */
+ List<ComMngPopulationHouseUserDO> selectListIndex(Long communityId);
}
--
Gitblit v1.7.1