BJ_FS / urbanops

Commit e77e7a2d80c022e464d4c68db70737baadefc217

Authored by 颜惠青
1 parent fdd2c99b

位置查询修改为 经纬度

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