Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

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

@@ -53,7 +53,12 @@
    */
    HouseVO getHouseDetail(@Param("house") HouseVO house);

    List<HouseExcel> export(HouseVO household);
   /**
    * 导出房屋数据
    * @param house
    * @return
    */
   List<HouseExcel> export(@Param("house") HouseVO house);

   /**
    * 查询房屋树
@@ -64,4 +69,9 @@
   @MapKey(value = "code")
    Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
                              @Param("list") List<String> list);

    Integer getHouseStatisticsOne(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
    Integer getHouseStatisticsTwo(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
    Integer getHouseStatisticsThree(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
    Integer getHouseStatisticsFour(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
}