From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 71c0774..fa15745 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,7 +74,7 @@
void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 住户对应物业，网格，公安负责人查询
@@ -84,4 +84,24 @@
Object getHouseholdOtherInfo(HouseholdVO household);
Object getHouseHoldStatistics(String code, String roleType);
+
+ /**
+ * 住户业主信息处理，将业主人员插入到用户表
+ * @return
+ */
+ Object userHandle();
+
+ /**
+ * 住户 删除
+ */
+ boolean removeHousehold(String ids);
+
+ List<HouseholdVO> getAllHouseHold(HouseholdVO household);
+
+ /**
+ * 住户列表查询
+ * @param household
+ * @return
+ */
+ List<HouseholdVO> selectHouseholdList(HouseholdVO household);
}
--
Gitblit v1.9.3