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/service/IHouseholdService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 6171201..e0fbf3c 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -17,7 +17,7 @@
package org.springblade.modules.house.service;
import com.baomidou.mybatisplus.extension.service.IService;
-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.HouseholdVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,7 +47,7 @@
* @param userId
* @return
*/
- List<TreeNode> selectHouseNodeList(Long userId);
+ List<TreeStringNode> selectHouseNodeList(Long userId);
/**
* 查询房屋人员情况
@@ -61,7 +61,7 @@
* @param household
* @return
*/
- boolean saveOrUpdateHousehold(HouseholdEntity household);
+ boolean saveOrUpdateHousehold(HouseholdVO household);
/**
* 住户 自定义查询详情
@@ -73,4 +73,21 @@
List<HouseHoldExcel> export(HouseholdVO household);
void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
+
+ Integer statistics(Long userId,String neiCode);
+
+ /**
+ * 住户对应物业，网格，公安负责人查询
+ * @param household
+ * @return
+ */
+ Object getHouseholdOtherInfo(HouseholdVO household);
+
+ Object getHouseHoldStatistics(String code, String roleType);
+
+ /**
+ * 住户业主信息处理，将业主人员插入到用户表
+ * @return
+ */
+ Object userHandle();
}
--
Gitblit v1.9.3