From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index bb34e55..c53dea1 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -17,7 +17,7 @@
package org.springblade.modules.house.mapper;
import org.apache.ibatis.annotations.Param;
-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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,7 +49,7 @@
* @param userId
* @return
*/
- List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+ List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
/**
* 查询房屋人员情况
@@ -65,6 +65,11 @@
*/
HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);
+ /**
+ * 导出
+ * @param household
+ * @return
+ */
List<HouseHoldExcel> export(HouseholdVO household);
Integer statistics(Long userId);
--
Gitblit v1.9.3