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/mapper/HouseMapper.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
index bc89f99..92ba0e9 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -25,6 +25,7 @@
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
+import org.springblade.modules.label.vo.LabelVO;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,7 @@
List<HouseVO> selectHousePage(IPage page,
@Param("house") HouseVO house,
@Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
@Param("isAdministrator") Integer isAdministrator);
/**
@@ -88,11 +90,37 @@
List<String> getHouseUnit(String districtCode, String building);
+ @MapKey("id")
List<Map<String, Object>> labelStatistics(@Param("house") HouseVO house,
@Param("regionChildCodesList") List<String> regionChildCodesList,
@Param("isAdministrator") Integer isAdministrator);
+ @MapKey("id")
List<Map<String, Object>> labelCommunityStatistics(@Param("house") HouseVO house,
- @Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("regionChildCodesList") List<String> regionChildCodesList);
+
+ List<LabelVO> getlabelCount(@Param("house") HouseVO house,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("streetCode") String streetCode);
+
+ /**
+ * 查询未绑定网格或警格的数据
+ * @param type 1:网格 2：警格
+ * @return
+ */
+ List<HouseEntity> getNotBindGridOrJwGridList(@Param("type") Integer type);
+
+ /**
+ * 按房屋标签统计
+ * @param house
+ * @param isAdministrator
+ * @param regionChildCodesList
+ * @param gridCodeList
+ * @return
+ */
+ List<Map<String, Object>> getHouseLabelStatistic(@Param("house") HouseVO house,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("regionChildCodesList")List<String> regionChildCodesList,
+ @Param("gridCodeList")List<String> gridCodeList);
}
--
Gitblit v1.9.3