Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/house/mapper/HouseMapper.java

@@ -25,6 +25,7 @@
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.vo.LabelVO;

import java.util.List;
import java.util.Map;
@@ -47,17 +48,20 @@
   List<HouseVO> selectHousePage(IPage page,
                          @Param("house") HouseVO house,
                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                          @Param("gridCodeList") List<String> gridCodeList,
                          @Param("isAdministrator") Integer isAdministrator);

   /**
    * 房屋自定义详情查询
    *
    * @param house
    * @return
    */
    HouseVO getHouseDetail(@Param("house") HouseVO house);
   HouseVO getHouseDetail(@Param("house") HouseVO house);

   /**
    * 导出房屋数据
    *
    * @param house
    * @return
    */
@@ -85,4 +89,38 @@
   List<String> getHouseBuilding(String districtCode);

   List<String> getHouseUnit(String districtCode, String building);

   @MapKey("id")
   List<Map<String, Object>>  labelStatistics(@Param("house") HouseVO house,
                                    @Param("regionChildCodesList") List<String> regionChildCodesList,
                                    @Param("isAdministrator") Integer isAdministrator);

   @MapKey("id")
   List<Map<String, Object>>  labelCommunityStatistics(@Param("house") HouseVO house,
                                          @Param("regionChildCodesList") List<String> regionChildCodesList);

   List<LabelVO> getlabelCount(@Param("house") HouseVO house,
                        @Param("regionChildCodesList") List<String> regionChildCodesList,
                        @Param("isAdministrator") Integer isAdministrator,
                        @Param("streetCode") String streetCode);

   /**
    * 查询未绑定网格或警格的数据
    * @param type 1:网格  2：警格
    * @return
    */
   List<HouseEntity> getNotBindGridOrJwGridList(@Param("type") Integer type);

   /**
    * 按房屋标签统计
    * @param house
    * @param isAdministrator
    * @param regionChildCodesList
    * @param gridCodeList
    * @return
    */
   List<Map<String, Object>> getHouseLabelStatistic(@Param("house") HouseVO house,
                                        @Param("isAdministrator") Integer isAdministrator,
                                        @Param("regionChildCodesList")List<String> regionChildCodesList,
                                        @Param("gridCodeList")List<String> gridCodeList);
}