From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index f05686b..0433b77 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 场所表 Mapper 接口
@@ -34,6 +35,22 @@
*/
public interface PlaceMapper extends BaseMapper<PlaceEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param place
+ * @param houseCodeList
+ * @param regionChildCodesList
+ * @param isAdministrator
+ * @return
+ */
+ List<PlaceVO> selectPlacePage(IPage page,
+ @Param("place") PlaceVO place,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 九小场所档案
@@ -53,22 +70,6 @@
@Param("isAdministrator") Integer isAdministrator,
@Param("nineTypeList") List<String> nineTypeList);
-
- /**
- * 自定义分页
- *
- * @param page
- * @param place
- * @param houseCodeList
- * @param regionChildCodesList
- * @param isAdministrator
- * @return
- */
- List<PlaceVO> selectPlacePage(IPage page,
- @Param("place") PlaceVO place,
- @Param("houseCodeList") List<String> houseCodeList,
- @Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
/**
* 查询场所集合信息
@@ -168,4 +169,23 @@
* @return
*/
Boolean comparisonPositionNotHouseCode(@Param("place") PlaceVO placeVO);
+
+ /**
+ * 查询 综治网格为空的数据
+ * @return
+ */
+ List<PlaceEntity> getPlaceNotGridCode();
+
+ /**
+ * 查询对应未的场所 house_code_binds 为空，source = 1 的
+ * @return
+ */
+ List<PlaceEntity> selectPlaceNotDoorBindList();
+
+ /**
+ * 查询绑定的房屋
+ * @param houseCodeBinds
+ * @return
+ */
+ List<Map<String,Object>> getHouseBindMap(@Param("houseCodeBinds") String houseCodeBinds);
}
--
Gitblit v1.9.3