diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java index d3338e5..73c6b06 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java @@ -47,4 +47,6 @@ public interface OrderInfoMapper extends BaseMapper { BizCompanyEntity getTransInfo(@Param("transCompanyId") Long transCompanyId); DeviceLocalizerEntity gpsLastOnlineTime(@Param("gpsId") String gpsId); + + List getRoute(@Param("id") Long id); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java index bd31465..f682595 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java @@ -542,5 +542,6 @@ public class OrderPagingResult { private String stationPhone; private Double stationLng; private Double stationLat; + private String route; // endregion } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index bd5cd1a..9759edb 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -213,8 +213,12 @@ public class OrderInfoService extends ServiceImplquery() + List routes = baseMapper.getRoute(id); + String route = StrUtil.join("--> ", routes); + OrderPagingResult orderPagingResult = baseMapper.detail(Wrappers.query() .in("a.id", id)); + orderPagingResult.setRoute(route); + return orderPagingResult; } /** diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index 5badc6f..400cdb8 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -358,4 +358,13 @@ where terminal_id = #{gpsId} and deleted = 0 +