likang

catch/fan/controller/Fan.php

@@ -37,6 +37,7 @@ class Fan extends CatchController
     public function save(Request $request) : \think\Response
     {
         $data = $request->post();
+       
         if($data['production_date']){
             $data['production_date'] = date('Y-m-d',$data['production_date']);
         }
@@ -64,14 +65,14 @@ class Fan extends CatchController
      */
     public function update(Request $request, $id) : \think\Response
     {   $data = $request->post();
-        if($data['production_date']){
-            $date = date('Y-m-d',$data['production_date']);
-            $data['production_date'] = $date?$date:$data['production_date'];
+      
+        if(!strstr($data['production_date'],'-'))
+        {
+            $data['production_date'] = date('Y-m-d',$data['production_date']);
         }
-        if($data['install_date']){
-            $date = date('Y-m-d',$data['install_date']);
-            $data['install_date'] = $date?$date:$data['install_date'];
-           
+        if(!strstr($data['install_date'],'-'))
+        {
+            $data['install_date'] = date('Y-m-d',$data['install_date']);
         }
         return CatchResponse::success($this->fanModel->updateBy($id, $data));
     }

catch/fan/database/migrations/20220510063603_fan_add_field.php

@@ -0,0 +1,50 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class FanAddField extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('fan')) {
+            $table = $this->table('fan');
+
+            $table->addColumn('name', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '风机名称',])
+            ->addColumn('img', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '图片',])
+            ->update();
+        }
+
+
+    }
+}

catch/fan/model/Fan.php

@@ -3,13 +3,17 @@
 namespace catchAdmin\fan\model;
 
 use catcher\base\CatchModel as Model;
+use catcher\traits\db\BaseOptionsTrait;
+use catcher\traits\db\ScopeTrait;
 use think\facade\Db;
 use catchAdmin\fan\model\get\FanGet;
 use catchAdmin\fan\model\search\FanSearch;
+
 class Fan extends Model
 {
-     use FanGet;
-     use FanSearch;
+    use BaseOptionsTrait, ScopeTrait;
+    use FanGet;
+    use FanSearch;
     // 表名
     public $name = 'fan';
     // 数据库字段映射
@@ -39,6 +43,10 @@ class Fan extends Model
         'updated_at',
         // 软删除
         'deleted_at',
+        // 风机名称 
+        'name',
+        // 图片
+        'img',
     );
     public function getList()
     {

catch/flange/controller/Flange.php

@@ -90,7 +90,6 @@ class Flange extends CatchController
         {
           $where[]=['name','like','%'.$data['wind'].'%'];
         }
-    
         $wind_list = Db::name("wind")->field('id as wid,number as value,name as text')->select();
         $wind_list =json_decode(json_encode($wind_list),true);
         
@@ -123,19 +122,8 @@ class Flange extends CatchController
 
        $wrenchList =  Db::name("wrench")->alias('w')->leftJoin("device_mold d",'w.model=d.id')
        ->where($where)->field('w.id as value,w.name as text,w.number,d.name as name')->select();
-
        return CatchResponse::success($wrenchList);
    }
-   /**
-    * 选择同步方案
-    *
-    * @param Request $request
-    * @return void
-    */
-   public function chooseSynscheme(Request $request)
-   {
-     $list =  Db::name("synscheme")->field('id as value,name as text')->select();
-     return CatchResponse::success($list);
-   }
+  
 
 }

catch/flange/model/Flange.php

@@ -142,5 +142,28 @@ class Flange extends Model
         }
         return $str;
     }
+    //搜索部门
+    public function searchDepartmentIdAttr($query, $value, $data)
+    {
+        return $query->where('department_id', '=', $value);
+    }
+    //搜索编号
+    public function searchNumberAttr($query, $value, $data)
+    {
+        return $query->where('number', '=', $value);
+    }
+    //搜索名称
+    public function searchNameAttr($query, $value, $data)
+    {
+        return $query->where('name', '=', $value);
+    }
+    //搜索模型
+
+    public function searchModelAttr($query, $value, $data)
+    {
+        return $query->where('model', '=', $value);
+    }
+
+
 
 }

catch/flange/route.php

@@ -16,6 +16,6 @@ $router->group(function () use ($router){
 	$router->get("getwindfan",'\catchAdmin\flange\controller\Flange@getWindFan');
 	//扳手类型
 	$router->get("wrenchtype",'\catchAdmin\flange\controller\Flange@chooseWrench');
-	//选择同步方案
-	$router->get("synschemes",'\catchAdmin\flange\controller\Flange@chooseSynscheme');
+	
+	
 })->middleware('auth');

catch/synscheme/controller/Synscheme.php

@@ -66,4 +66,31 @@ class Synscheme extends CatchController
     {
         return CatchResponse::success($this->synschemeModel->deleteBy($id));
     }
+    /**
+     * 获取方案
+     * @param Request $request
+     * @return void
+     */
+    public function getSynscheme(Request $request)
+    {
+        $data =$request->get();
+        $where=[];
+        if(!empty($data['id']))
+        {   $ids =implode(",",$data['id']);
+            $where[] = ['id','in',$ids];
+        }
+        $syn_list=$this->synschemeModel->where($where)->select();
+        return CatchResponse::success($syn_list);
+    }
+     /**
+    * 选择同步方案
+    *
+    * @param Request $request
+    * @return void
+    */
+   public function chooseSynscheme(Request $request)
+   {
+     $list =  $this->synschemeModel->field('id as value,name as text')->select();
+     return CatchResponse::success($list);
+   }
 }

catch/synscheme/database/migrations/20220509190422_synscheme.php

@@ -32,7 +32,7 @@ class Synscheme extends Migrator
         $table = $this->table('synscheme', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
         $table->addColumn('hole', 'string', ['limit' => 11,'null' => true,'signed' => true,'comment' => '孔',])
 			->addColumn('step', 'string', ['limit' => 11,'null' => true,'signed' => true,'comment' => '步骤',])
-			->addColumn('data', 'string', ['limit' => 500,'null' => true,'signed' => true,'comment' => '同步数据 json',])
+			->addColumn('data', 'longText', ['limit' => 2000,'null' => true,'signed' => true,'comment' => '同步数据 json',])
 			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建人ID',])
 			->addColumn('created_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建时间',])
 			->addColumn('updated_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '更新时间',])

catch/synscheme/model/Synscheme.php

@@ -27,4 +27,25 @@ class Synscheme extends Model
         'deleted_at',
         'name'
     );
+    public function getDataAttr()
+    {
+        $data = $this->getData('data');
+        if(empty($data))
+        {
+            $data = [];
+        }
+        else
+        {
+            $data = json_decode($data,true);
+        }
+        return $data;
+
+    }
+    public function setDataAttr($value)
+    {
+        
+       return json_encode($value);
+    }
+
+
 }

catch/synscheme/route.php

@@ -13,5 +13,8 @@
 $router->group(function () use ($router){
 	// synscheme路由
 	$router->resource('synscheme', '\catchAdmin\synscheme\controller\Synscheme');
-
+	//获取方案
+	$router->get('synlist', '\catchAdmin\synscheme\controller\Synscheme@getSynscheme');
+	//选择同步方案
+	$router->get("synschemetype",'\catchAdmin\synscheme\controller\Synscheme@chooseSynscheme');
 })->middleware('auth');