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 | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 f929bb2..24de1df 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -17,14 +17,16 @@
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.HouseholdOtherVO;
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;
+import java.util.Map;
/**
* 住户 Mapper 接口
@@ -49,7 +51,7 @@
* @param userId
* @return
*/
- List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+ List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
/**
* 查询房屋人员情况
@@ -70,7 +72,38 @@
* @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);
+
+ /**
+ * 查询物业
+ * @param household
+ * @return
+ */
+ HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);
+
+ /**
+ * 查询网格
+ * @param household
+ * @return
+ */
+ HouseholdOtherVO getGrid(@Param("household") HouseholdVO household);
+
+ /**
+ * 查询公安信息
+ * @param household
+ * @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