From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001 From: linwe <872216996@qq.com> Date: Sat, 23 Dec 2023 17:19:12 +0800 Subject: [PATCH] bug修复 --- src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 21 ++++++++++++++++++--- 1 files changed, 18 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 2144683..71c0774 100644 --- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java +++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java @@ -17,11 +17,11 @@ 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 org.springblade.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.modules.house.excel.HouseHoldExcel; import java.util.List; @@ -47,7 +47,7 @@ * @param userId * @return */ - List<TreeNode> selectHouseNodeList(Long userId); + List<TreeStringNode> selectHouseNodeList(Long userId); /** * 查询房屋人员情况 @@ -69,4 +69,19 @@ * @return */ Object getDetail(HouseholdEntity household); + + List<HouseHoldExcel> export(HouseholdVO household); + + void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered); + + Integer statistics(Long userId); + + /** + * 住户对应物业，网格，公安负责人查询 + * @param household + * @return + */ + Object getHouseholdOtherInfo(HouseholdVO household); + + Object getHouseHoldStatistics(String code, String roleType); } -- Gitblit v1.9.3