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/IHouseholdService.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 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 fa15745..9a9cbbd 100644 --- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java +++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java @@ -16,12 +16,13 @@ */ package org.springblade.modules.house.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.springblade.common.node.TreeIntegerNode; 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; import org.springblade.modules.house.excel.HouseHoldExcel; +import org.springblade.modules.house.vo.HouseholdVO; import java.util.List; @@ -74,7 +75,7 @@ void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered); - Integer statistics(Long userId,String neiCode); + Integer statistics(Long userId,String neiCode,Integer confirmFlag); /** * 住户对应物业，网格，公安负责人查询 @@ -94,14 +95,26 @@ /** * 住户 删除 */ - boolean removeHousehold(String ids); + boolean removeHousehold(String ids); List<HouseholdVO> getAllHouseHold(HouseholdVO household); /** * 住户列表查询 + * * @param household * @return */ List<HouseholdVO> selectHouseholdList(HouseholdVO household); + + IPage<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household); + + /** + * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户） + * @param list + * @return + */ + List<HouseholdVO> getHouseholdListByParam(List<Integer> list); + + List<TreeIntegerNode> getlabelStatistics(HouseholdVO household); } -- Gitblit v1.9.3