From ef26284c60a88e765dd6786a5947186e23c0ff82 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Sun, 4 Jan 2026 10:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisory/order/mapper/OrderInfoMapper.java        | 2 ++
 .../supervisory/order/pojo/result/OrderPagingResult.java | 1 +
 .../supervisory/order/service/OrderInfoService.java      | 6 +++++-
 .../src/main/resources/mapper/order/OrderInfoMapper.xml  | 9 +++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

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<OrderInfoEntity> {
     BizCompanyEntity getTransInfo(@Param("transCompanyId") Long transCompanyId);
 
     DeviceLocalizerEntity gpsLastOnlineTime(@Param("gpsId") String gpsId);
+
+    List<String> 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 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;
     }
 
     /**
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
     </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>