From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |   12 +++++++++---
 1 files changed, 9 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 2144683..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,7 +47,7 @@
 	 * @param userId
 	 * @return
 	 */
-    List<TreeNode> selectHouseNodeList(Long userId);
+    List<TreeStringNode> selectHouseNodeList(Long userId);
 
 	/**
 	 * 查询房屋人员情况
@@ -69,4 +69,10 @@
 	 * @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