cqp 2 ماه پیش
والد
کامیت
363b1de8ff
3فایلهای تغییر یافته به همراه13 افزوده شده و 1 حذف شده
  1. 1 1
      app/Model/Device.php
  2. 8 0
      app/Service/DeviceService.php
  3. 4 0
      config/header/66.php

+ 1 - 1
app/Model/Device.php

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

+ 8 - 0
app/Service/DeviceService.php

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

+ 4 - 0
config/header/66.php

@@ -26,6 +26,10 @@ return [
         'key' =>'size',
         'value' => '规格型号',
     ],
+    [
+        'key' =>'power',
+        'value' => '功率',
+    ],
     [
         'key' =>'mark',
         'value' => '备注',