From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Thu, 14 Mar 2024 18:15:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/house/service/IUserHouseLabelService.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 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 880f0c2..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,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 org.springblade.modules.system.excel.UserExcel; import java.util.List; @@ -45,13 +44,18 @@ /** * 住户-标签 自定义新增或修改 + * * @param householdLabel * @return */ - boolean saveOrUpdateHouseholdLabel(UserHouseLabelEntity householdLabel); + boolean saveOrUpdateHouseholdLabel(UserHouseLabelEntity householdLabel); List<Integer> selectUserLabelList(UserHouseLabelDTO userHouseLabelDTO); - void importUserHouseLabel(List<UserHouseLabelExcel> data, Boolean isCovered); + 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