From a2704917e53918213ce91390d14a98960fdd5bab Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 13 五月 2025 14:07:25 +0800
Subject: [PATCH] fix:历史订单可以查询

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java |   72 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index 998237f..beaa2d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -1,7 +1,13 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
+import java.util.*;
 
+import com.ruoyi.system.domain.DispatchOrd;
+import com.ruoyi.system.domain.TbOrders;
+import com.ruoyi.system.domain.TbVehicleOrder;
+import com.ruoyi.system.service.IDispatchOrdService;
+import com.ruoyi.system.service.ITbOrdersService;
+import com.ruoyi.system.service.ITbVehicleOrderService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,20 +37,81 @@
 public class VehicleGpsController extends BaseController {
     @Autowired
     private IVehicleGpsService vehicleGpsService;
+
+    @Autowired
+    private ITbVehicleOrderService tbVehicleOrderService;
+
+    @Autowired
+    private IDispatchOrdService dispatchOrdService;
+
+    @Autowired
+    private ITbOrdersService tbOrdersService;
+
    /**
      * 鏌ヨ杞﹁締GPS鍧愭爣鍒楄〃
      */  
     @PreAuthorize("@ss.hasPermi('system:gps:list')")
     @GetMapping("/list")
     public TableDataInfo list(VehicleGps vehicleGps) {
+
         startPage();
+        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+        vehicleGps.setOrderByColumn("collect_time");
+        vehicleGps.setIsAsc("desc");
         List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
         return getDataTable(list);
     }
     @Anonymous(needSign=true)   
     @GetMapping("/anonymousList")
     public TableDataInfo anonymousList(VehicleGps vehicleGps) {
+
+        if(vehicleGps.getOrderId()==null)
+        {
+            return getDataTable(new ArrayList<>());
+        }
+
+        //鏌ヨ璁㈠崟
+        TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(vehicleGps.getOrderId());
+        if(tbVehicleOrder==null)
+        {
+            return getDataTable(new ArrayList<>());
+        }
+
+        if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
+        {
+            //闈�0琛ㄧず璁㈠崟瀹屾垚浜嗐��
+
+            TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
+            if(tbOrders==null)
+            {
+                return getDataTable(new ArrayList<>());
+            }
+
+
+            DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(tbOrders.getServiceOrdID());
+            if(dispatchOrd==null)
+            {
+                return getDataTable(new ArrayList<>());
+            }
+
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime",dispatchOrd.getDispatchOrdStartDate());
+            params.put("endTime",dispatchOrd.getDispatchOrdUpdateTime());
+
+            vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
+            startPage();
+            // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+            vehicleGps.setOrderByColumn("collect_time");
+            vehicleGps.setIsAsc("desc");
+            List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
+            return getDataTable(list);
+        }
+
+        vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
         startPage();
+        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+        vehicleGps.setOrderByColumn("collect_time");
+        vehicleGps.setIsAsc("desc");
         List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
         return getDataTable(list);
     }
@@ -56,6 +123,9 @@
     @Log(title = "杞﹁締GPS鍧愭爣", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(VehicleGps vehicleGps) {
+        // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+        vehicleGps.setOrderByColumn("collect_time");
+        vehicleGps.setIsAsc("desc");
         List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
         ExcelUtil<VehicleGps> util = new ExcelUtil<VehicleGps>(VehicleGps.class);
         return util.exportExcel(list, "杞﹁締GPS鍧愭爣鏁版嵁");

--
Gitblit v1.9.1