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/mapper/HouseMapper.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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 e456c1b..4eede44 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -16,15 +16,16 @@
*/
package org.springblade.modules.house.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.house.excel.HouseExcel;
+import org.springblade.modules.label.vo.LabelVO;
import java.util.List;
import java.util.Map;
@@ -44,17 +45,23 @@
* @param house
* @return
*/
- List<HouseVO> selectHousePage(IPage page, HouseVO house);
+ List<HouseVO> selectHousePage(IPage page,
+ @Param("house") HouseVO house,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 房屋自定义详情查询
+ *
* @param house
* @return
*/
- HouseVO getHouseDetail(@Param("house") HouseVO house);
+ HouseVO getHouseDetail(@Param("house") HouseVO house);
/**
* 导出房屋数据
+ *
* @param house
* @return
*/
@@ -62,16 +69,45 @@
/**
* 查询房屋树
+ *
* @param houseParam
* @param list
* @return
*/
@MapKey(value = "code")
- Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
+ Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
@Param("list") List<String> list);
- Integer getHouseStatisticsOne(String code, Long userId);
- Integer getHouseStatisticsTwo(String code, Long userId);
- Integer getHouseStatisticsThree(String code, Long userId);
- Integer getHouseStatisticsFour(String code, Long userId);
+ Integer getHouseStatisticsOne(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+ Integer getHouseStatisticsTwo(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+ Integer getHouseStatisticsThree(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+ Integer getHouseStatisticsFour(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+ List<String> getHouseBuilding(String districtCode);
+
+ 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);
+
+ 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);
}
--
Gitblit v1.9.3