From 81e1be286fecfc279731ced211d5315b4dfee00f Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 13 五月 2025 14:11:33 +0800
Subject: [PATCH] fix:修复
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 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 beaa2d0..e54c9f9 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
@@ -80,31 +80,35 @@
if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
{
//闈�0琛ㄧず璁㈠崟瀹屾垚浜嗐��
+ try {
+ TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
+ if (tbOrders == null) {
+ return getDataTable(new ArrayList<>());
+ }
- TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
- if(tbOrders==null)
+
+ 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);
+ }
+ catch (Exception ex)
{
+ logger.error("宸插畬鎴愮殑璁㈠崟鏌ヨ鍦板浘寮傚父锛歿}",ex.getMessage());
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());
--
Gitblit v1.9.1