From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 56 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 bb34e55..317679b 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 接口
@@ -43,13 +45,20 @@
 	 */
 	List<HouseholdVO> selectHouseholdPage(IPage page,@Param("household") HouseholdVO household);
 
+	/**
+	 * 获取全部
+	 * @param household
+	 * @return
+	 */
+	List<HouseholdVO> getAllHouseHold(@Param("household")HouseholdVO household);
+
 
 	/**
 	 * 查询房屋集合信息
 	 * @param userId
 	 * @return
 	 */
-    List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+    List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
 
 	/**
 	 * 查询房屋人员情况
@@ -65,7 +74,50 @@
 	 */
 	HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);
 
-	List<HouseHoldExcel> export(HouseholdVO household);
+	/**
+	 * 导出
+	 * @param household
+	 * @return
+	 */
+	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();
+
+	/**
+	 * 住户列表查询
+	 * @param household
+	 * @return
+	 */
+	List<HouseholdVO> selectHouseholdList(@Param("household")HouseholdVO household);
 }

--
Gitblit v1.9.3