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 | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 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 4069571..0433b77 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -19,11 +19,13 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.vo.PlaceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 场所表 Mapper 接口
@@ -33,19 +35,41 @@
*/
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("houseCodeList") List<String> houseCodeList,
+ @Param("gridCodeList") List<String> gridCodeList,
@Param("regionChildCodesList") List<String> regionChildCodesList,
@Param("isAdministrator") Integer isAdministrator);
+
+ /**
+ * 九小场所档案
+ *
+ * @param page
+ * @param place
+ * @param gridCodeList
+ * @param regionChildCodesList
+ * @param isAdministrator
+ * @param isAdministrator
+ * @return
+ */
+ List<PlaceVO> selectNinePlacePage(IPage page,
+ @Param("place") PlaceVO place,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("nineTypeList") List<String> nineTypeList);
+
/**
* 查询场所集合信息
@@ -119,4 +143,49 @@
*/
List<PlaceVO> getPlaceListByParam(@Param("list") List<String> stringList,
@Param("tableName") String tableName);
+
+ List<NinePlaceExcel> export( @Param("place") PlaceVO place,
+ @Param("houseCodeList") List<String> houseCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("nineTypeList") List<String> nineTypeList);
+
+ /**
+ * 查询 警务网格为空的数据
+ * @return
+ */
+ List<PlaceEntity> getPlaceNotJwGridCode();
+
+ /**
+ * 比对两点间的距离是否在1km 范围内(和地址总表位置对比)
+ * @param placeVO
+ * @return
+ */
+ Integer comparisonPosition(@Param("place") PlaceVO placeVO);
+
+ /**
+ * 比对两点间的距离是否在1km 范围内 (和采集的位置对比)
+ * @param placeVO
+ * @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