fix:修复

wzp

2025-05-13 81e1be286fecfc279731ced211d5315b4dfee00f

 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());