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/IUserHouseLabelService.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java b/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java
index 016c34c..fc4267f 100644
--- a/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java
+++ b/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java
@@ -16,13 +16,17 @@
  */
 package org.springblade.modules.house.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.vo.HouseLabelVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.house.dto.UserHouseLabelDTO;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
+import org.springblade.modules.house.excel.UserHouseLabelExcel;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
+
+import java.util.List;
 
 /**
- * 房屋-标签 服务类
+ * 住户-标签 服务类
  *
  * @author BladeX
  * @since 2023-10-28
@@ -33,16 +37,25 @@
 	 * 自定义分页
 	 *
 	 * @param page
-	 * @param houseLabel
+	 * @param householdLabel
 	 * @return
 	 */
-	IPage<HouseLabelVO> selectHouseLabelPage(IPage<HouseLabelVO> page, HouseLabelVO houseLabel);
-
+	IPage<HouseholdLabelVO> selectHouseholdLabelPage(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);
 
 	/**
-	 * 房屋-标签 自定义新增或修改
-	 * @param houseLabel
+	 * 住户-标签 自定义新增或修改
+	 *
+	 * @param householdLabel
 	 * @return
 	 */
-    boolean saveOrUpdateHouseLabel(UserHouseLabelEntity houseLabel);
+	boolean saveOrUpdateHouseholdLabel(UserHouseLabelEntity householdLabel);
+
+
+	List<Integer> selectUserLabelList(UserHouseLabelDTO userHouseLabelDTO);
+
+	void importUserHouseLabel(List<UserHouseLabelExcel> data, Boolean isCovered);
+
+	IPage<HouseholdLabelVO> statisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);
+
+	IPage<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);
 }

--
Gitblit v1.9.3