liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

Update

main
Jing Li 2023-10-08 12:18:16 +08:00
parent ae8ac2d257
commit 5747965331
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/Admin/DeviceService.php
View File

@ -131,12 +131,12 @@ class DeviceService extends BaseService
$_fields = explode(',', $device->pivot->fields); $_fields = explode(',', $device->pivot->fields);
} }
if($diffDays) { if($diffDays) {
$modelQuery = $dayliyReportQuery->whereBetween('reported_at', [$startTime, $endTime]); $modelQuery = (clone $dayliyReportQuery)->whereBetween('reported_at', [$startTime, $endTime]);
}else{ }else{
$modelQuery = $reportQuery->whereDate('reported_at', $day); $modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
} }
if($modelQuery){ if($modelQuery){
$datalist = $modelQuery->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray(); $datalist = (clone $modelQuery)->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
} }
//组装数据； //组装数据；