1
0
Fork 0
main
vine_liutk 2023-08-08 10:54:13 +08:00
parent 63f4013b42
commit 07e0158115
1 changed files with 2 additions and 2 deletions

View File

@ -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';
}