From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Wed, 20 Mar 2024 17:20:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 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 b557208..f7bba5c 100644 --- a/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java +++ b/src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java @@ -16,11 +16,12 @@ */ package org.springblade.modules.house.service; +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 com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -43,11 +44,25 @@ /** * 住户-标签 自定义新增或修改 + * * @param householdLabel * @return */ - boolean saveOrUpdateHouseholdLabel(UserHouseLabelEntity householdLabel); + 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); + + /** + * 房屋-标签 房屋自定义新增或修改 + * @param householdLabel + * @return + */ + boolean saveOrUpdateHouseLabel(UserHouseLabelEntity householdLabel); } -- Gitblit v1.9.3