Update
parent
5747965331
commit
89004769d6
|
|
@ -136,7 +136,7 @@ class DeviceService extends BaseService
|
||||||
$modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
|
$modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
|
||||||
}
|
}
|
||||||
if($modelQuery){
|
if($modelQuery){
|
||||||
$datalist = (clone $modelQuery)->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
|
$datalist = $modelQuery->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
//组装数据;
|
//组装数据;
|
||||||
|
|
@ -285,7 +285,7 @@ class DeviceService extends BaseService
|
||||||
$modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
|
$modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
|
||||||
}
|
}
|
||||||
if($modelQuery){
|
if($modelQuery){
|
||||||
$datalist = (clone $modelQuery)->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
|
$datalist = $modelQuery->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
//组装数据;
|
//组装数据;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue