From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 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 482c569..9a2ba58 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
@@ -28,27 +28,27 @@
 @Mapper
 public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> {
 
-    @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 "
+    @Select("select cmphu.id, cmphu.house_id,cmph.address,cmph.status,cmph.purpose,cmph.control_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}"
+        + "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 != &quot;&quot;'>" + "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,cmv.name 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 != &quot;&quot;'>" + "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 != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
         + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "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 != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
         + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "and cmv.house_num = #{houseNum}" + " </if> "
         + "<if test='floor != null and floor != &quot;&quot;'>" + "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 != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
         + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "and cmv.house_num = #{houseNum}" + " </if> "
         + "<if test='floor != null and floor != &quot;&quot;'>" + "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 != &quot;&quot;'>" +
         // "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> "
@@ -169,13 +169,13 @@
     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")
+    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} and floor is not null group by floor 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")
+    @Select("select id as houseId,unit_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no is not null group by unit_no 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")
+    @Select("select id as houseId,house_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no = #{unitNo} and house_no is not null group by house_no order by create_at asc")
     List<ComMngSubordinateVO> getHouseLevelByHouseNos(@Param("villageId") Long villageId, @Param("floor") String floor,
         @Param("unitNo") String unitNo);
 
@@ -189,4 +189,19 @@
         + ",#{item.purpose},#{item.controlStatus},#{item.isEmpty},#{item.constructPurpose}"
         + ",#{item.constructArea},#{item.path},now())" + "    </foreach>" + " </script>")
     void insertAll(@Param("houseList") List<ComMngPopulationHouseDO> houseList);
+
+    /**
+     * 修改房屋关联单元号
+     * @param villageId 小区id
+     * @param floor 楼栋号
+     * @param oldUnitNo 原单元号
+     * @param newUnitNo 新单元号
+     */
+    void updateHouseUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);
+
+    /**
+     * 修改房屋关联单元号
+     * @param houseList    需要修改的数据
+     */
+    void updateUnitAll(@Param("houseList") List<ComMngPopulationHouseDO> houseList);
 }

--
Gitblit v1.7.1