From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 525f893..9a9cbbd 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -18,6 +18,7 @@
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.excel.HouseHoldExcel;
@@ -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);
/**
* 住户对应物业，网格，公安负责人查询
@@ -114,4 +115,6 @@
* @return
*/
List<HouseholdVO> getHouseholdListByParam(List<Integer> list);
+
+ List<TreeIntegerNode> getlabelStatistics(HouseholdVO household);
}
--
Gitblit v1.9.3