From 594679f7d81962a2030cd9e3cc6ab94ff57281e5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 Nov 2023 14:02:51 +0800
Subject: [PATCH] 报事报修新增事发地经纬度和地址字段

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |    6 +++++-
 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java             |    2 +-
 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java        |   15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 7a9be10..9328afa 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -281,7 +281,11 @@
 
     <!--查询社区信息-->
     <select id="getAllDoorplateAddress" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
-        select * from jczz_doorplate_address where nei_name = #{name}
+        select * from jczz_doorplate_address
+        where 1=1
+        <if test="name!=null and name!=''">
+            and nei_name = #{name}
+        </if>
     </select>
 
     <!--获取房屋树-->
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index a8b38e9..b03c1d9 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -134,7 +134,7 @@
 	@Transactional(rollbackFor = Exception.class)
 	public Object spatialAnalysis() {
 		// 按社区
-		String name = "万达社区居民委员会";
+		String name = null;
 //		String name = "茶山路社区居民委员会";
 		//查询社区信息
 		List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(name);
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index 91d4875..46e33a9 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -104,4 +104,19 @@
 	 */
 	@ApiModelProperty(value = "确认意见")
 	private String confirmNotion;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String lng;
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String lat;
+	/**
+	 * 事发地地址
+	 */
+	@ApiModelProperty(value = "事发地地址")
+	private String address;
 }

--
Gitblit v1.9.3