From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 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 8fb24df..b9be750 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -17,11 +17,11 @@
 package org.springblade.modules.house.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.common.node.TreeNode;
+import org.springblade.common.node.TreeStringNode;
 import org.springblade.modules.house.entity.HouseholdEntity;
 import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.house.excel.HouseHoldExcel;
 
 import java.util.List;
 
@@ -47,5 +47,32 @@
 	 * @param userId
 	 * @return
 	 */
-    List<TreeNode> selectHouseNodeList(Long userId);
+    List<TreeStringNode> selectHouseNodeList(Long userId);
+
+	/**
+	 * 查询房屋人员情况
+	 * @param code
+	 * @return
+	 */
+    List<HouseholdVO> getHouseholdListByCode(String code);
+
+	/**
+	 * 住户 自定义新增或修改
+	 * @param household
+	 * @return
+	 */
+    boolean saveOrUpdateHousehold(HouseholdEntity household);
+
+	/**
+	 * 住户 自定义查询详情
+	 * @param household
+	 * @return
+	 */
+	Object getDetail(HouseholdEntity household);
+
+    List<HouseHoldExcel> export(HouseholdVO household);
+
+	void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
+
+    Integer statistics(Long userId);
 }

--
Gitblit v1.9.3