Commit e77e7a2d80c022e464d4c68db70737baadefc217
1 parent
fdd2c99b
位置查询修改为 经纬度
Showing
3 changed files
with
15 additions
and
4 deletions
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 { | @@ -49,6 +49,8 @@ public class MainInfoHasTaskPageReqVO extends PageParam { | ||
| 49 | private String roadName; | 49 | private String roadName; |
| 50 | @Schema(description = "街道名称", example = "芋艿") | 50 | @Schema(description = "街道名称", example = "芋艿") |
| 51 | private String streetName; | 51 | private String streetName; |
| 52 | + @Schema(description = "经纬度地址", example = "芋艿") | ||
| 53 | + private String lonLatAddress; | ||
| 52 | @Schema(description = "养护级别ID", example = "1") | 54 | @Schema(description = "养护级别ID", example = "1") |
| 53 | private Integer curingLevelId; | 55 | private Integer curingLevelId; |
| 54 | 56 |
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> { | @@ -86,6 +86,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> { | ||
| 86 | " <if test=\"query.roadName != null and query.roadName != ''\">", | 86 | " <if test=\"query.roadName != null and query.roadName != ''\">", |
| 87 | " AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')", | 87 | " AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')", |
| 88 | " </if>", | 88 | " </if>", |
| 89 | + " <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">", | ||
| 90 | + " AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')", | ||
| 91 | + " </if>", | ||
| 89 | " <if test=\"query.streetName != null and query.streetName != ''\">", | 92 | " <if test=\"query.streetName != null and query.streetName != ''\">", |
| 90 | " AND m.street_name = #{query.streetName}", | 93 | " AND m.street_name = #{query.streetName}", |
| 91 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", | 94 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", |
| @@ -322,6 +325,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> { | @@ -322,6 +325,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> { | ||
| 322 | " AND m.street_name = #{query.streetName}", | 325 | " AND m.street_name = #{query.streetName}", |
| 323 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", | 326 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", |
| 324 | " </if>", | 327 | " </if>", |
| 328 | + " <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">", | ||
| 329 | + " AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')", | ||
| 330 | + " </if>", | ||
| 325 | " <if test='query.curingLevelId != null'>", | 331 | " <if test='query.curingLevelId != null'>", |
| 326 | " AND m.curing_level_id = #{query.curingLevelId}", | 332 | " AND m.curing_level_id = #{query.curingLevelId}", |
| 327 | " </if>", | 333 | " </if>", |
| @@ -443,6 +449,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> { | @@ -443,6 +449,9 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> { | ||
| 443 | " AND m.street_name = #{query.streetName}", | 449 | " AND m.street_name = #{query.streetName}", |
| 444 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", | 450 | " <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->", |
| 445 | " </if>", | 451 | " </if>", |
| 452 | + " <if test=\"query.lonLatAddress != null and query.lonLatAddress != ''\">", | ||
| 453 | + " AND m.lon_lat_address LIKE CONCAT('%', #{query.lonLatAddress}, '%')", | ||
| 454 | + " </if>", | ||
| 446 | " <if test='query.curingLevelId != null'>", | 455 | " <if test='query.curingLevelId != null'>", |
| 447 | " AND m.curing_level_id = #{query.curingLevelId}", | 456 | " AND m.curing_level_id = #{query.curingLevelId}", |
| 448 | " </if>", | 457 | " </if>", |
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
| @@ -418,7 +418,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | @@ -418,7 +418,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | ||
| 418 | String content = pageVO.getSearchContent(); | 418 | String content = pageVO.getSearchContent(); |
| 419 | if(ObjectUtils.isNotAllEmpty(type)){ | 419 | if(ObjectUtils.isNotAllEmpty(type)){ |
| 420 | if("1".equals(type)){ | 420 | if("1".equals(type)){ |
| 421 | - if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);} | 421 | + if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);} |
| 422 | } else | 422 | } else |
| 423 | if("2".equals(type)){ | 423 | if("2".equals(type)){ |
| 424 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} | 424 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} |
| @@ -454,7 +454,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | @@ -454,7 +454,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | ||
| 454 | String content = pageVO.getSearchContent(); | 454 | String content = pageVO.getSearchContent(); |
| 455 | if(ObjectUtils.isNotAllEmpty(type)){ | 455 | if(ObjectUtils.isNotAllEmpty(type)){ |
| 456 | if("1".equals(type)){ | 456 | if("1".equals(type)){ |
| 457 | - if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);} | 457 | + if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);} |
| 458 | } else | 458 | } else |
| 459 | if("2".equals(type)){ | 459 | if("2".equals(type)){ |
| 460 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} | 460 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} |
| @@ -491,7 +491,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | @@ -491,7 +491,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | ||
| 491 | String content = pageVO.getSearchContent(); | 491 | String content = pageVO.getSearchContent(); |
| 492 | if(ObjectUtils.isNotAllEmpty(type)){ | 492 | if(ObjectUtils.isNotAllEmpty(type)){ |
| 493 | if("1".equals(type)){ | 493 | if("1".equals(type)){ |
| 494 | - if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);} | 494 | + if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setLonLatAddress(content);} |
| 495 | } else | 495 | } else |
| 496 | if("2".equals(type)){ | 496 | if("2".equals(type)){ |
| 497 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} | 497 | if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);} |
| @@ -733,7 +733,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | @@ -733,7 +733,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ | ||
| 733 | String content = pageVO.getSearchContent(); | 733 | String content = pageVO.getSearchContent(); |
| 734 | if(ObjectUtils.isNotAllEmpty(type)){ | 734 | if(ObjectUtils.isNotAllEmpty(type)){ |
| 735 | if("1".equals(type)){ | 735 | if("1".equals(type)){ |
| 736 | - if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setRoadName(content);} | 736 | + if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setLonLatAddress(content);} |
| 737 | } else | 737 | } else |
| 738 | if("2".equals(type)){ | 738 | if("2".equals(type)){ |
| 739 | if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderName(content);} | 739 | if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderName(content);} |