From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseService.java b/src/main/java/org/springblade/modules/house/service/IHouseService.java
index dc8a078..a644ab0 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseService.java
@@ -47,24 +47,27 @@
 
 	/**
 	 * 房屋自定义详情查询
+	 *
 	 * @param house
 	 * @return
 	 */
-    HouseVO getHouseDetail(HouseVO house);
+	HouseVO getHouseDetail(HouseVO house);
 
 	/**
 	 * 房屋自定义新增或修改
+	 *
 	 * @param house
 	 * @return
 	 */
 	boolean saveOrUpdateHouse(HouseEntity house);
 
-    void importUserHouse(List<HouseExcel> data, Boolean isCovered);
+	void importUserHouse(List<HouseExcel> data, Boolean isCovered);
 
 	List<HouseExcel> export(HouseVO household);
 
 	/**
 	 * 查询房屋树
+	 *
 	 * @param houseParam
 	 * @return
 	 */
@@ -83,4 +86,20 @@
 	List<String> getHouseBuilding(String districtCode);
 
 	List<String> getHouseUnit(String districtCode, String building);
+
+	List<Map<String, Object>> labelStatistics(HouseVO house);
+
+	List<Map<String, Object>> labelCommunityStatistics(HouseVO house);
+
+	/**
+	 * 房屋网格处理
+	 * @return
+	 */
+    Object houseGridHandle();
+
+	/**
+	 * 房屋警格处理
+	 * @return
+	 */
+	Object houseJwGridHandle();
 }

--
Gitblit v1.9.3