xinyouhe/car_info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
HESU\HESU
2025-06-16 11:36:17 +08:00
parent 269e2bc277
commit cfb277e446
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/VehicleController.php
+9 -2
View File
@@ -259,8 +259,8 @@ class VehicleController
$his['last_time_utc'] = date('Y-m-d H:i:s', $his['last_time_utc']); $his['last_time_utc'] = date('Y-m-d H:i:s', $his['last_time_utc']);
} }
unset($his); unset($his);
$logisticsShip['last_time_utc'] = date('Y-m-d H:i:s', $logisticsShip['last_time_utc']); $logisticsShip['eta'] = date('Y-m-d', $logisticsShip['eta_utc']);
$logisticsShip['eta_utc'] = date('Y-m-d H:i:s', $logisticsShip['eta_utc']); $logisticsShip['last_time'] = date('Y-m-d',$logisticsShip['last_time_utc']);
$count = Vehicle::where(['ship_id' => $id])->count(); $count = Vehicle::where(['ship_id' => $id])->count();
$result = ['list' => $vehicles,'ship' => $logisticsShip,'ship_his' => $logisticsShipHis,'count'=>$count]; $result = ['list' => $vehicles,'ship' => $logisticsShip,'ship_his' => $logisticsShipHis,'count'=>$count];
@@ -337,10 +337,17 @@ class VehicleController
public function shipList(Request $request){ public function shipList(Request $request){
$navigate = LogisticsShip::where(['status' => 0])->get(); $navigate = LogisticsShip::where(['status' => 0])->get();
$pending = LogisticsShip::where(['status' => 1])->get(); $pending = LogisticsShip::where(['status' => 1])->get();
foreach ($navigate as &$val) {
$val['count'] = Vehicle::where(['ship_id' => $val->id])->count();
$val['eta'] = date('Y-m-d',$val['eta_utc']);
$val['last_time'] = date('Y-m-d',$val['last_time_utc']);
}
foreach ($pending as &$val) { foreach ($pending as &$val) {
$val['count'] = Vehicle::where(['ship_id' => $val->id])->count(); $val['count'] = Vehicle::where(['ship_id' => $val->id])->count();
$val['eta'] = date('Y-m-d',$val['eta_utc']); $val['eta'] = date('Y-m-d',$val['eta_utc']);
$val['last_time'] = date('Y-m-d',$val['last_time_utc']);
} }
unset($val);
$result = ['navigate' => $navigate,'pending' => $pending]; $result = ['navigate' => $navigate,'pending' => $pending];
return Util::success($result); return Util::success($result);