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

调整

main
vine_liutk 2023-08-08 10:54:13 +08:00
parent 63f4013b42
commit 07e0158115
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ class DeviceService extends BaseService
foreach($monitorMode->devices as $device){ foreach($monitorMode->devices as $device){
$_fields = explode(',', $device->pivot->fields); $_fields = explode(',', $device->pivot->fields);
if($diffDays) { if($diffDays) {
$modelQuery = $dayliyReportQuery->whereBetween('reported_at', [$startTime, $endTime]); $modelQuery = $dayliyReportQuery->whereBetween('reported_at', [$startTime, $endTime]);
}else{ }else{
@ -130,7 +130,7 @@ class DeviceService extends BaseService
$_data = []; $_data = [];
foreach($xKeys as $key){ foreach($xKeys as $key){
if(!$diffDays) { if(!$diffDays) {
$key = date('Y-m-d').' '. $key.':00'; $key = $day.' '. $key.':00';
}else{ }else{
$key .= ' 00:00:00'; $key .= ' 00:00:00';
} }