From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 15 +++++++++++++--
1 files changed, 13 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 ec54fd3..24de1df 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -26,6 +26,7 @@
import org.springblade.modules.house.excel.HouseHoldExcel;
import java.util.List;
+import java.util.Map;
/**
* 住户 Mapper 接口
@@ -71,9 +72,9 @@
* @param household
* @return
*/
- List<HouseHoldExcel> export(HouseholdVO household);
+ List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 查询物业
@@ -95,4 +96,14 @@
* @return
*/
HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
+
+ List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
+
+ List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId,String roleType);
+
+ /**
+ * 查询所有未入库的业主信息
+ * @return
+ */
+ List<HouseholdEntity> getNotInsertUserHousehold();
}
--
Gitblit v1.9.3