From cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:06:34 +0800
Subject: [PATCH] 邮件收件+bug修复+流程优化
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 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 c417556..7c8ff1d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -36,23 +36,6 @@
/**
- * 九小场所档案
- *
- * @param page
- * @param place
- * @param houseCodeList
- * @param regionChildCodesList
- * @param isAdministrator
- * @return
- */
- List<PlaceVO> selectNinePlacePage(IPage page,
- @Param("place") PlaceVO place,
- @Param("houseCodeList") List<String> houseCodeList,
- @Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
-
-
- /**
* 自定义分页
*
* @param page
@@ -64,9 +47,28 @@
*/
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);
+
/**
* 查询场所集合信息
@@ -144,11 +146,38 @@
List<NinePlaceExcel> export( @Param("place") PlaceVO place,
@Param("houseCodeList") List<String> houseCodeList,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @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();
}
--
Gitblit v1.9.3