From 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 17:16:27 +0800
Subject: [PATCH] 投票人员查询优化

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 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 e4574f1..f05686b 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -19,6 +19,7 @@
 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;
@@ -39,16 +40,18 @@
 	 *
 	 * @param page
 	 * @param place
-	 * @param houseCodeList
+	 * @param gridCodeList
 	 * @param regionChildCodesList
+	 * @param isAdministrator
 	 * @param isAdministrator
 	 * @return
 	 */
 	List<PlaceVO> selectNinePlacePage(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("isAdministrator") Integer isAdministrator,
+								  @Param("nineTypeList") List<String> nineTypeList);
 
 
 	/**
@@ -139,4 +142,30 @@
 	 */
     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);
 }

--
Gitblit v1.9.3