From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |   81 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 75 insertions(+), 6 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 8fb24df..9a9cbbd 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 org.springblade.core.mp.base.BaseService;
 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,5 +48,73 @@
 	 * @param userId
 	 * @return
 	 */
-    List<TreeNode> selectHouseNodeList(Long userId);
+    List<TreeStringNode> selectHouseNodeList(Long userId);
+
+	/**
+	 * 查询房屋人员情况
+	 * @param code
+	 * @return
+	 */
+    List<HouseholdVO> getHouseholdListByCode(String code);
+
+	/**
+	 * 住户 自定义新增或修改
+	 * @param household
+	 * @return
+	 */
+    boolean saveOrUpdateHousehold(HouseholdVO household);
+
+	/**
+	 * 住户 自定义查询详情
+	 * @param household
+	 * @return
+	 */
+	Object getDetail(HouseholdEntity household);
+
+    List<HouseHoldExcel> export(HouseholdVO household);
+
+	void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
+
+    Integer statistics(Long userId,String neiCode,Integer confirmFlag);
+
+	/**
+	 * 住户对应物业，网格，公安负责人查询
+	 * @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