From b90dd346397578463d1302823642e2f3c3e8edbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 08 Dec 2023 16:37:10 +0800
Subject: [PATCH] e呼即应新增字段，地址查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/task/entity/ECallEventEntity.java | 15 +++++++++++++++
2 files changed, 24 insertions(+), 0 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 3b27113..cd9f2b1 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -36,6 +36,15 @@
<!--自定义分页查询-->
<select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
select * from jczz_doorplate_address where 1=1
+ <if test="doorplateAddress.aoiName!=null and doorplateAddress.aoiName!=''">
+ and aoi_name like concat('%',#{doorplateAddress.aoiName},'%')
+ </if>
+ <if test="doorplateAddress.addressName!=null and doorplateAddress.addressName!=''">
+ and address_name like concat('%',#{doorplateAddress.addressName},'%')
+ </if>
+ <if test="doorplateAddress.townStreetCode != null and doorplateAddress.townStreetCode != ''">
+ and town_street_code like concat('%',#{doorplateAddress.townStreetCode},'%')
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/entity/ECallEventEntity.java b/src/main/java/org/springblade/modules/task/entity/ECallEventEntity.java
index cf688f8..5cbda36 100644
--- a/src/main/java/org/springblade/modules/task/entity/ECallEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/ECallEventEntity.java
@@ -77,6 +77,21 @@
@ApiModelProperty(value = "发生地点")
private String scene;
/**
+ * 事发位置
+ */
+ @ApiModelProperty(value = "事发位置")
+ private String location;
+ /**
+ * 事发地经度
+ */
+ @ApiModelProperty(value = "事发地经度")
+ private String lng;
+ /**
+ * 事发地纬度
+ */
+ @ApiModelProperty(value = "事发地纬度")
+ private String lat;
+ /**
* 发生时间
*/
@ApiModelProperty(value = "发生时间")
--
Gitblit v1.9.3