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 | 12 +++++++++---
1 files changed, 9 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 ca68e29..24de1df 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -74,7 +74,7 @@
*/
List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 查询物业
@@ -97,7 +97,13 @@
*/
HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
- List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId);
+ List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
- List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId);
+ List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId,String roleType);
+
+ /**
+ * 查询所有未入库的业主信息
+ * @return
+ */
+ List<HouseholdEntity> getNotInsertUserHousehold();
}
--
Gitblit v1.9.3