风场

catch/fan/controller/Fan.php

@@ -6,6 +6,7 @@ use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
 use catchAdmin\fan\model\Fan as fanModel;
+use think\facade\Db;
 
 class Fan extends CatchController
 {
@@ -13,6 +14,7 @@ class Fan extends CatchController
     
     public function __construct(FanModel $fanModel)
     {
+        
         $this->fanModel = $fanModel;
     }
     
@@ -23,6 +25,7 @@ class Fan extends CatchController
      */
     public function index(Request $request) : \think\Response
     {
+
         return CatchResponse::paginate($this->fanModel->getList());
     }
     
@@ -33,7 +36,14 @@ class Fan extends CatchController
      */
     public function save(Request $request) : \think\Response
     {
-        return CatchResponse::success($this->fanModel->storeBy($request->post()));
+        $data = $request->post();
+        if($data['production_date']){
+            $data['production_date'] = date('Y-m-d',$data['production_date']);
+        }
+        if($data['install_date']){
+            $data['install_date'] = date('Y-m-d',$data['install_date']);
+        }
+        return CatchResponse::success($this->fanModel->storeBy($data));
     }
     
     /**
@@ -66,4 +76,5 @@ class Fan extends CatchController
     {
         return CatchResponse::success($this->fanModel->deleteBy($id));
     }
+    
 }

catch/fan/model/Fan.php

@@ -3,9 +3,13 @@
 namespace catchAdmin\fan\model;
 
 use catcher\base\CatchModel as Model;
-
+use think\facade\Db;
+use catchAdmin\fan\model\get\FanGet;
+use catchAdmin\fan\model\search\FanSearch;
 class Fan extends Model
 {
+     use FanGet;
+     use FanSearch;
     // 表名
     public $name = 'fan';
     // 数据库字段映射
@@ -36,4 +40,13 @@ class Fan extends Model
         // 软删除
         'deleted_at',
     );
+    public function getList()
+    {
+        return $this->catchSearch()
+        ->append(['wind_name'])
+        ->field('*')
+        ->catchOrder()
+        ->creator()
+        ->paginate();
+    }
 }

catch/fan/model/get/FanGet.php

@@ -0,0 +1,17 @@
+<?php
+namespace catchAdmin\fan\model\get;
+
+use think\facade\Db;
+
+trait FanGet
+{
+
+    public function getWindNameAttr()
+    {
+        $wind_id = $this->wind_id;
+        $wind_name =  Db::name('wind')->where('id',$wind_id)->value('name');
+        return $wind_name;
+    }    
+
+
+}

catch/fan/model/search/FanSearch.php

@@ -0,0 +1,19 @@
+<?php
+namespace catchAdmin\fan\model\search;
+trait FanSearch
+{
+
+    public function searchNumberAttr($query, $value, $data)
+    {
+        return $query->where('number', 'like', '%'.$value.'%');
+    }
+    public function searchWindIdAttr($query, $value, $data)
+    {
+        return $query->where('wind_id',$value);
+    }
+
+
+
+
+
+}

catch/wind/model/Wind.php

@@ -90,4 +90,9 @@ class Wind extends Model
         $id=$this->department_id;
         return Db::table('departments')->where('id', $id)->value('department_name');
     }
+    public function searchNameAttr($query, $value, $data)
+    {
+        return $query->where('name','like','%'.$value.'%');
+    }
+    
 }