diff --git a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java index 63967f6e..9b8a20d5 100644 --- a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java @@ -102,6 +102,9 @@ public class BazVisitInstanceServiceImpl extends ServiceImpl> getPage4Visit(BmsPointVisitSo param){ String sysUserId = AuthContextUtils.getSysUserId(); param.setUserId(sysUserId); + param.setTenantId(AuthContextUtils.getTenant()); PageUtil.startPage(); List list = channelPointMapper.selectUserPointList4Visit(param); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsPointVisitSo.java b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsPointVisitSo.java index 4b379501..f8509329 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsPointVisitSo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsPointVisitSo.java @@ -20,4 +20,7 @@ public class BmsPointVisitSo { /** 忽略这个参数,后端设值 */ String userId; + /** 忽略这个参数,后端设值 */ + String tenantId; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsUserPoint4VisitVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsUserPoint4VisitVo.java index 1075078e..3c3ad40e 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsUserPoint4VisitVo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsUserPoint4VisitVo.java @@ -19,9 +19,15 @@ public class BmsUserPoint4VisitVo { /** 网点名称 */ String pointName; + /** */ + String channelName; + /** 地址*/ String address; + /** 地图地址*/ + String mapAddress; + /** 距离 */ Double distance; diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java index d7015c6d..d98111fb 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java @@ -28,6 +28,7 @@ public interface BmsChannelPointMapper extends BaseMapper { List selectChannelPointList(@Param("query") BmsChannelPoint channelPoint); + @InterceptorIgnore(tenantLine = "1") List selectUserPointList4Visit(@Param("query") BmsPointVisitSo param); } diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index dff268b3..890e4089 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -93,9 +93,42 @@ ORDER BY `bms_channel_point`.`create_time` DESC - + SELECT + `bms_channel_point`.id, + `bms_channel_point`.point_code, + `bms_channel_point`.point_name, + `bms_channel_point`.channel_name, + `bms_channel_point`.address, + `bms_channel_point`.map_address + + ,st_distance_sphere ( + POINT ( bms_channel_point.local_y, bms_channel_point.local_x ), + POINT ( #{query.localY}, #{query.localX} )) AS distance + + FROM ( SELECT mu.target_id target_id FROM `bms_master_user` mu WHERE mu.type = 'point' AND del_flag = 0 AND user_id = #{query.userId} AND tenant_id = #{query.tenantId} ) pmu + LEFT JOIN `bms_channel_point` `bms_channel_point` ON `bms_channel_point`.id = pmu.target_id + + and `bms_channel_point`.`del_flag` = 0 + and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') + and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') + + ORDER BY + + -distance desc, + + bms_channel_point.id