From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index b9be750..e0fbf3c 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -61,7 +61,7 @@
 	 * @param household
 	 * @return
 	 */
-    boolean saveOrUpdateHousehold(HouseholdEntity household);
+    boolean saveOrUpdateHousehold(HouseholdVO household);
 
 	/**
 	 * 住户 自定义查询详情
@@ -74,5 +74,20 @@
 
 	void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
 
-    Integer statistics(Long userId);
+    Integer statistics(Long userId,String neiCode);
+
+	/**
+	 * 住户对应物业，网格，公安负责人查询
+	 * @param household
+	 * @return
+	 */
+    Object getHouseholdOtherInfo(HouseholdVO household);
+
+	Object getHouseHoldStatistics(String code, String roleType);
+
+	/**
+	 * 住户业主信息处理，将业主人员插入到用户表
+	 * @return
+	 */
+    Object userHandle();
 }

--
Gitblit v1.9.3