From e77e7a2d80c022e464d4c68db70737baadefc217 Mon Sep 17 00:00:00 2001
From: yanhuiqing <yanhuiqing2008@163.com>
Date: Tue, 6 Jan 2026 21:01:11 +0800
Subject: [PATCH] 位置查询修改为 经纬度

---
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java |  2 ++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java                  |  9 +++++++++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java                   |  8 ++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java
index c997f18..e5ece59 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java
@@ -49,6 +49,8 @@ public class MainInfoHasTaskPageReqVO extends PageParam {
     private String roadName;
     @Schema(description = "街道名称", example = "芋艿")
     private String streetName;
+    @Schema(description = "经纬度地址", example = "芋艿")
+    private String lonLatAddress;
     @Schema(description = "养护级别ID", example = "1")
     private Integer curingLevelId;
 
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
index 23c917b..1ba95ea 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
@@ -86,6 +86,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
             "  <if test=\"query.roadName != null and query.roadName != ''\">",
             "    AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')",
             "  </if>",
+            "  <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">",
+            "    AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')",
+            "  </if>",
             "  <if test=\"query.streetName != null and query.streetName != ''\">",
             "    AND m.street_name = #{query.streetName}",
             "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
@@ -322,6 +325,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
             "    AND m.street_name = #{query.streetName}",
             "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
             "  </if>",
+            "  <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">",
+            "    AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')",
+            "  </if>",
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
@@ -443,6 +449,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
             "    AND m.street_name = #{query.streetName}",
             "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
             "  </if>",
+            "  <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">",
+            "    AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')",
+            "  </if>",
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
index 8454718..65c8060 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -418,7 +418,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         String content = pageVO.getSearchContent();
         if(ObjectUtils.isNotAllEmpty(type)){
             if("1".equals(type)){
-                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);}
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);}
             } else
             if("2".equals(type)){
                 if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);}
@@ -454,7 +454,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         String content = pageVO.getSearchContent();
         if(ObjectUtils.isNotAllEmpty(type)){
             if("1".equals(type)){
-                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);}
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);}
             } else
             if("2".equals(type)){
                 if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);}
@@ -491,7 +491,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         String content = pageVO.getSearchContent();
         if(ObjectUtils.isNotAllEmpty(type)){
             if("1".equals(type)){
-                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);}
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);}
             } else
             if("2".equals(type)){
                 if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);}
@@ -733,7 +733,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         String content = pageVO.getSearchContent();
         if(ObjectUtils.isNotAllEmpty(type)){
             if("1".equals(type)){
-                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setRoadName(content);}
+                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setLonLatAddress(content);}
             } else
             if("2".equals(type)){
                 if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderName(content);}
--
libgit2 0.21.4