修改

catch/hydraulic/controller/Hydraulic.php

@@ -37,7 +37,9 @@ class Hydraulic extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
-
+        if(!$data['out_date']){
+            $data['out_date'] = null;
+        }
         return CatchResponse::success($this->hydraulicModel->storeBy($data));
     }
     
@@ -63,6 +65,9 @@ class Hydraulic extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
+        if(!$data['out_date']){
+            $data['out_date'] = null;
+        }
         return CatchResponse::success($this->hydraulicModel->updateBy($id, $data));
     }
     

catch/hydraulic/controller/Wrench.php

@@ -37,6 +37,9 @@ class Wrench extends CatchController
         if(isset($data['out_date'])  && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
+        if(!$data['out_date']){
+            $data['out_date'] = null;
+        }
         return CatchResponse::success($this->wrenchModel->storeBy($data));
     }
     
@@ -62,6 +65,9 @@ class Wrench extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
+        if(!$data['out_date']){
+            $data['out_date'] = null;
+        }
         return CatchResponse::success($this->wrenchModel->updateBy($id, $data));
     }
     

catch/hydraulic/model/Wrench.php

@@ -3,6 +3,8 @@
 namespace catchAdmin\hydraulic\model;
 
 use catcher\base\CatchModel as Model;
+use \think\facade\Db;
+use catchAdmin\system\model\SysDictData;
 use catchAdmin\permissions\model\DataRangScopeTrait;
 class Wrench extends Model
 {
@@ -65,10 +67,57 @@ class Wrench extends Model
     {
         $res =  $this->dataRange()
             ->catchSearch()
+            ->append(['depart_name', 'creator_user','model_name'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
     }
 
+
+    /**
+     * 获取导入用户（文本）
+     */
+    public function getCreatorUserAttr($value)
+    {
+        $uid = $this->creator_id;
+        return Db::table('users')->where('id', $uid)->value('username') ?: '';
+    }
+
+    /**
+     * 获取部门名称（文本）
+     */
+    public function getDepartNameAttr()
+    {
+        $id = $this->getData('department_id');
+        return Db::table('departments')->where('id', $id)->value('department_name');
+    }
+
+     /**
+     * 获取类型名称
+     */
+    public function getModelAttr($value)
+    {
+        return (int)$value;
+    }
+    /**
+     * 获取类型名称
+     */
+    public function getModelNameAttr()
+    {
+        $id = $this->getData('model');
+        return Db::table('device_mold')->where('id', $id)->value('name');
+    }
+    /**
+     * 获取部门名称（文本）
+     */
+    public function getOnlineTimeAttr($value)
+    {
+       if($value){
+            return date('Y-m-d H:i:s',$value);
+       }else{
+           return '-';
+       }
+    }
+
   
 }

catch/logs/controller/WrenchCheckLog.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace catchAdmin\logs\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\logs\model\WrenchCheckLog as wrenchCheckLogModel;
+
+class WrenchCheckLog extends CatchController
+{
+    protected $wrenchCheckLogModel;
+    
+    public function __construct(WrenchCheckLogModel $wrenchCheckLogModel)
+    {
+        $this->wrenchCheckLogModel = $wrenchCheckLogModel;
+    }
+    
+    /**
+     * 列表
+     * @time 2022年05月07日 10:34
+     * @param Request $request 
+     */
+    public function index(Request $request) : \think\Response
+    {
+        return CatchResponse::paginate($this->wrenchCheckLogModel->getList());
+    }
+    
+    /**
+     * 保存信息
+     * @time 2022年05月07日 10:34
+     * @param Request $request 
+     */
+    public function save(Request $request) : \think\Response
+    {
+        return CatchResponse::success($this->wrenchCheckLogModel->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     * @time 2022年05月07日 10:34
+     * @param $id 
+     */
+    public function read($id) : \think\Response
+    {
+        return CatchResponse::success($this->wrenchCheckLogModel->findBy($id));
+    }
+    
+    /**
+     * 更新
+     * @time 2022年05月07日 10:34
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id) : \think\Response
+    {
+        return CatchResponse::success($this->wrenchCheckLogModel->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     * @time 2022年05月07日 10:34
+     * @param $id
+     */
+    public function delete($id) : \think\Response
+    {
+        return CatchResponse::success($this->wrenchCheckLogModel->deleteBy($id));
+    }
+}

catch/logs/database/migrations/20220507103454_wrench_check_log.php

@@ -0,0 +1,49 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class WrenchCheckLog 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()
+    {
+        $table = $this->table('wrench_check_log', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('device_number', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '设备编号',])
+            ->addColumn('max_pressure', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '最大压力',])
+			->addColumn('min_pressure', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '最小压力',])
+			->addColumn('max_torque', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '最大扭矩',])
+			->addColumn('min_torque', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '最小扭矩',])
+			->addColumn('check_state', 'string', ['limit' => 8,'null' => true,'signed' => true,'comment' => '检测是否合格',])
+			->addColumn('exterior_state', 'string', ['limit' => 8,'null' => true,'signed' => true,'comment' => '外观是否合格',])
+			->addColumn('hydraulic_number', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '泵编号',])
+			->addColumn('checked_user', 'string', ['limit' => 16,'null' => true,'signed' => true,'comment' => '检验员',])
+			->addColumn('check_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '检验时间',])
+			->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' => '更新时间',])
+			->addColumn('deleted_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '软删除',])
+            ->create();
+    }
+}

catch/logs/model/MaintainLog.php

@@ -42,4 +42,8 @@ class MaintainLog extends Model
     {
         return $query->where('device_number',$value);
     }
+    public function getOnlineTimeAttr($value)
+    {
+        return $value ? date('Y-m-d H:i:s',$value) : '';
+    }
 }

catch/logs/model/WrenchCheckLog.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace catchAdmin\logs\model;
+
+use catcher\base\CatchModel as Model;
+
+class WrenchCheckLog extends Model
+{
+    // 表名
+    public $name = 'wrench_check_log';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        'device_number',
+        // 最大压力
+        'max_pressure',
+        // 最小压力
+        'min_pressure',
+        // 最大扭矩
+        'max_torque',
+        // 最小扭矩
+        'min_torque',
+        // 检测是否合格
+        'check_state',
+        // 外观是否合格
+        'exterior_state',
+        // 泵编号
+        'hydraulic_number',
+        // 检验员
+        'checked_user',
+        // 检验时间
+        'check_time',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+    public function getList()
+    {
+        return $this->catchSearch()
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+    }
+    public function searchDeviceNumberAttr($query, $value, $data)
+    {
+        return $query->where('device_number',$value);
+    }
+    public function getCheckTimeAttr($value)
+    {
+        return $value ? date('Y-m-d H:i:s',$value) : '';
+    }
+}

catch/logs/route.php

@@ -23,4 +23,6 @@ $router->group(function () use ($router){
 	$router->resource('batteryLog', '\catchAdmin\logs\controller\BatteryLog');
 	// maintainLog路由
 	$router->resource('maintainLog', '\catchAdmin\logs\controller\MaintainLog');
+	// wrenchCheckLog路由
+	$router->resource('wrenchCheckLog', '\catchAdmin\logs\controller\WrenchCheckLog');
 })->middleware('auth');