路线

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java

@@ -47,4 +47,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfoEntity> {
     BizCompanyEntity getTransInfo(@Param("transCompanyId") Long transCompanyId);
 
     DeviceLocalizerEntity gpsLastOnlineTime(@Param("gpsId") String gpsId);
+
+    List<String> getRoute(@Param("id") Long id);
 }

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
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -213,8 +213,12 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
      * 详情
      */
     public OrderPagingResult detail(Long id) {
-        return baseMapper.detail(Wrappers.<OrderPagingResult>query()
+        List<String> routes = baseMapper.getRoute(id);
+        String route = StrUtil.join("--> ", routes);
+        OrderPagingResult orderPagingResult = baseMapper.detail(Wrappers.<OrderPagingResult>query()
                 .in("a.id", id));
+        orderPagingResult.setRoute(route);
+        return orderPagingResult;
     }
 
     /**

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -358,4 +358,13 @@
         where terminal_id = #{gpsId}
           and deleted = 0
     </select>
+    <select id="getRoute" resultType="java.lang.String">
+        SELECT b.name route_name
+        FROM order_route a
+                 INNER JOIN order_route_detail b ON a.id = b.order_route_id
+        WHERE a.order_id = #{id}
+          AND b.name IS NOT NULL
+          AND TRIM(b.name) != ''
+        ORDER BY b.sort, b.create_time, b.id
+    </select>
 </mapper>