@@ -15,7 +15,7 @@ class Device extends UseScopeBaseModel
2 => '禁用',
];
- public static $field = ['title','id','code','crt_id','crt_time','size','mark','is_use','type','type_2'];
+ public static $field = ['title','id','code','crt_id','crt_time','size','mark','is_use','type','type_2','power'];
const type_one = 1;
const type_two = 2;
@@ -179,6 +179,14 @@ class DeviceService extends Service
$model->where('crt_time','>=',$return[0]);
$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;
@@ -26,6 +26,10 @@ return [
'key' =>'size',
'value' => '规格型号',
],
+ [
+ 'key' =>'power',
+ 'value' => '功率',
+ ],
[
'key' =>'mark',
'value' => '备注',