diff --git a/app/Services/Admin/DeviceService.php b/app/Services/Admin/DeviceService.php index 8d4cd0b..0e94236 100644 --- a/app/Services/Admin/DeviceService.php +++ b/app/Services/Admin/DeviceService.php @@ -115,7 +115,7 @@ class DeviceService extends BaseService foreach($monitorMode->devices as $device){ $_fields = explode(',', $device->pivot->fields); - + if($diffDays) { $modelQuery = $dayliyReportQuery->whereBetween('reported_at', [$startTime, $endTime]); }else{ @@ -130,7 +130,7 @@ class DeviceService extends BaseService $_data = []; foreach($xKeys as $key){ if(!$diffDays) { - $key = date('Y-m-d').' '. $key.':00'; + $key = $day.' '. $key.':00'; }else{ $key .= ' 00:00:00'; }