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/mapper/HouseholdMapper.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 69d9f03..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,11 +17,13 @@
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.house.excel.HouseHoldExcel;
+
import java.util.List;
/**
@@ -39,7 +41,7 @@
* @param household
* @return
*/
- List<HouseholdVO> selectHouseholdPage(IPage page, HouseholdVO household);
+ List<HouseholdVO> selectHouseholdPage(IPage page,@Param("household") HouseholdVO household);
/**
@@ -47,5 +49,28 @@
* @param userId
* @return
*/
- List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+ List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
+
+ /**
+ * 查询房屋人员情况
+ * @param code
+ * @return
+ */
+ List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);
+
+ /**
+ * 住户 自定义查询详情
+ * @param household
+ * @return
+ */
+ HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);
+
+ /**
+ * 导出
+ * @param household
+ * @return
+ */
+ List<HouseHoldExcel> export(HouseholdVO household);
+
+ Integer statistics(Long userId);
}
--
Gitblit v1.9.3