From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index 4ece666..0fb2a0a 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -16,12 +16,13 @@
  */
 package org.springblade.modules.house.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.common.node.TreeNode;
-import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.modules.house.vo.HouseholdVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.common.node.TreeIntegerNode;
+import org.springblade.common.node.TreeStringNode;
+import org.springblade.modules.house.entity.HouseholdEntity;
 import org.springblade.modules.house.excel.HouseHoldExcel;
+import org.springblade.modules.house.vo.HouseholdVO;
 
 import java.util.List;
 
@@ -47,7 +48,7 @@
 	 * @param userId
 	 * @return
 	 */
-    List<TreeNode> selectHouseNodeList(Long userId);
+    List<TreeStringNode> selectHouseNodeList(Long userId);
 
 	/**
 	 * 查询房屋人员情况
@@ -61,7 +62,7 @@
 	 * @param household
 	 * @return
 	 */
-    boolean saveOrUpdateHousehold(HouseholdEntity household);
+    boolean saveOrUpdateHousehold(HouseholdVO household);
 
 	/**
 	 * 住户 自定义查询详情
@@ -74,5 +75,46 @@
 
 	void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
 
-    Integer statistics(Long userId);
+    Integer statistics(Long userId,String neiCode);
+
+	/**
+	 * 住户对应物业，网格，公安负责人查询
+	 * @param household
+	 * @return
+	 */
+    Object getHouseholdOtherInfo(HouseholdVO household);
+
+	Object getHouseHoldStatistics(String code, String roleType);
+
+	/**
+	 * 住户业主信息处理，将业主人员插入到用户表
+	 * @return
+	 */
+    Object userHandle();
+
+	/**
+	 * 住户 删除
+	 */
+	boolean removeHousehold(String ids);
+
+	List<HouseholdVO> getAllHouseHold(HouseholdVO household);
+
+	/**
+	 * 住户列表查询
+	 *
+	 * @param household
+	 * @return
+	 */
+	List<HouseholdVO> selectHouseholdList(HouseholdVO household);
+
+	IPage<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household);
+
+	/**
+	 * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）
+	 * @param list
+	 * @return
+	 */
+    List<HouseholdVO> getHouseholdListByParam(List<Integer> list);
+
+    List<TreeIntegerNode> getlabelStatistics(HouseholdVO household);
 }

--
Gitblit v1.9.3