|
@@ -179,6 +179,14 @@ class DeviceService extends Service
|
|
|
$model->where('crt_time','>=',$return[0]);
|
|
$model->where('crt_time','>=',$return[0]);
|
|
|
$model->where('crt_time','<=',$return[1]);
|
|
$model->where('crt_time','<=',$return[1]);
|
|
|
}
|
|
}
|
|
|
|
|
+ $model->when(!empty($data['power']), function ($query) use ($data) {
|
|
|
|
|
+ $power = $data['power'];
|
|
|
|
|
+ $operators = [1 => '>', 2 => '=', 3 => '<'];
|
|
|
|
|
+
|
|
|
|
|
+ if (isset($operators[$power['type']])) {
|
|
|
|
|
+ $query->where('power', $operators[$power['type']], $power['value']);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
return $model;
|
|
return $model;
|
|
|
}
|
|
}
|