From e9d5fb4b01c383fa5b01bf5e730d4e3da73f266e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 十二月 2021 11:27:15 +0800
Subject: [PATCH] 12/30 河门口大屏特殊修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 42401d2..a6355d5 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
@@ -34,21 +34,21 @@
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}"
+ + "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 and villageId != ""'>" + "and cmv.village_id = #{villageId}"
+ " </if> " + " </script>")
List<ComMngCascadeHouseVO> getHouseLevelByAlley(@Param(value = "communityId") Long communityId,
@Param(value = "villageId") Long villageId);
@Select("<script> "
- + "select id as houseId,cmv.alley,cmv.house_num 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}"
+ + "select id as houseId,cmv.alley,cmv.house_num 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='name != null and name != ""'>" + "and cmv.alley = #{name}" + " </if> "
+ "<if test='villageId != null'>" + "and cmv.village_id = #{villageId}" + " </if> " + " </script>")
List<ComMngCascadeHouseVO> getHouseLevelByHouseNum(@Param("name") String name,
@Param("communityId") Long communityId, @Param(value = "villageId") Long villageId);
@Select("<script> "
- + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor 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} "
+ + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor 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='name != null and name != ""'>" + "and cmv.alley = #{name}" + " </if> "
+ "<if test='houseNum != null and houseNum != ""'>" + "and cmv.house_num = #{houseNum}" + " </if> "
+ "<if test='villageId != null'>" + "and cmv.village_id = #{villageId}" + " </if> " + " </script>")
@@ -56,7 +56,7 @@
@Param("communityId") Long communityId, @Param(value = "villageId") Long villageId);
@Select("<script> "
- + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no 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} "
+ + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no 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='name != null and name != ""'>" + "and cmv.alley = #{name}" + " </if> "
+ "<if test='houseNum != null and houseNum != ""'>" + "and cmv.house_num = #{houseNum}" + " </if> "
+ "<if test='floor != null and floor != ""'>" + "and cmph.floor = #{floor}" + " </if> "
@@ -66,7 +66,7 @@
@Param(value = "villageId") Long villageId);
@Select("<script> "
- + "select cmph.id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no,cmph.house_no 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} "
+ + "select cmph.id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no,cmph.house_no 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='name != null and name != ""'>" + "and cmv.alley = #{name}" + " </if> "
+ "<if test='houseNum != null and houseNum != ""'>" + "and cmv.house_num = #{houseNum}" + " </if> "
+ "<if test='floor != null and floor != ""'>" + "and cmph.floor = #{floor}" + " </if> "
@@ -84,7 +84,7 @@
+ ",cmph.update_at,cmph.is_empty from com_mng_population_house as cmph"
+ " left join com_mng_village as cmv on cmv.village_id = cmph.village_id" + "<where>"
+ "<if test='populationHouseAdminDTO.communityId != null'>"
- + " and cmph.community_id = #{populationHouseAdminDTO.communityId} " + " </if> "
+ + " and cmph.community_id = ${populationHouseAdminDTO.communityId} " + " </if> "
+ "<if test='populationHouseAdminDTO.alley != null and populationHouseAdminDTO.alley != ""'>" +
// "AND cmv.alley like #{populationHouseAdminDTO.alley} " +
"AND cmv.alley like concat('%',#{populationHouseAdminDTO.alley},'%') " + " </if> "
@@ -124,17 +124,17 @@
ComMngPopulationHouseDetailAdminVO getHouseDetail(@Param("houseId") Long houseId);
@Select("select count(id) as houseTotal"
- + ",(select count(id) from com_mng_population_house where is_empty = 1 and community_id = #{communityId}) as emptyTotal"
- + ",(select count(id) from com_mng_population_house where control_status = 2 and community_id = #{communityId}) as followTotal"
- + ",(select count(id) from com_mng_population_house where control_status = 3 and community_id = #{communityId}) as controlTotal"
- + " from com_mng_population_house as cmph where community_id = #{communityId}")
+ + ",(select count(id) from com_mng_population_house where is_empty = 1 and community_id = ${communityId}) as emptyTotal"
+ + ",(select count(id) from com_mng_population_house where control_status = 2 and community_id = ${communityId}) as followTotal"
+ + ",(select count(id) from com_mng_population_house where control_status = 3 and community_id = ${communityId}) as controlTotal"
+ + " from com_mng_population_house as cmph where community_id = ${communityId}")
ComMngPopulationHouseTotalVO getHouseTotalByAdmin(@Param("communityId") Long communityId);
@Select("select (select province_name from com_mng_struct_area_province where province_adcode = ca.province_code) as provinceName,"
+ "(select city_name from com_mng_struct_area_city where city_adcode = ca.city_code) as cityName,"
+ "(select district_name from com_mng_struct_area_district where district_adcode = ca.area_code) as districtName"
+ ",ca.province_code as provinceAdcode,ca.city_code as cityAdcode,ca.area_code as districtAdcode"
- + " from com_act as ca where ca.community_id = #{communityId}")
+ + " from com_act as ca where ca.community_id = ${communityId}")
ComMngVillageRegionVO getRegion(@Param("communityId") Long communityId);
@Select("<script> "
--
Gitblit v1.7.1