设备维修保养搜索

application/api/controller/CostParameter.php

@@ -0,0 +1 @@
+<?php

application/api/controller/MachineList.php

@@ -393,14 +393,22 @@ class MachineList extends Api
             $this->error('请求错误');
         }
         $param = $this->request->param();
-        if (empty($param) || !isset($param['sist']) || !isset($param['mouth'])) {
+        if (empty($param)) {
             $this->error('参数错误');
         }
+        $where = [];
+        if (isset($param['mouth'])) {
+            $where['a.报障时间'] = ['like', $param['mouth'] . '%'];
+        }
+        if (isset($param['sist'])) {
+            $where['a.使用部门'] = $param['sist'];
+        }
+        if (isset($param['search'])) {
+            $where['a.故障现象'] = ['like','%'.$param['search'].'%'];
+        }
         $query = db('设备_维修记录')
             ->alias('a')
             ->join('人事_基本资料 b','a.报障人 = b.员工编号','left')
-            ->where('a.使用部门', $param['sist'])
-            ->where('a.报障时间', 'like', $param['mouth'] . '%')
             ->field('rtrim(a.设备编号) as 设备编号,rtrim(a.设备名称) as 设备名称,a.报障时间,a.维修受理时间,a.修复时间,a.实际维修工时 as 故障维修工时,rtrim(a.验收情况) as 验收情况,
             rtrim(b.员工姓名) as 机长,rtrim(c1.员工姓名) as 维修姓名1,rtrim(c2.员工姓名) as 维修姓名2,rtrim(c3.员工姓名) as 维修姓名3,rtrim(c4.员工姓名) as 维修姓名4,
             rtrim(a.故障现象) as 故障现象,rtrim(a.处理方法) as 处理方法,rtrim(a.使用部门) as 使用部门,a.sys_id as 创建用户,a.sys_rq as 创建时间,a.mod_rq as 修改时间,a.UniqId');
@@ -409,7 +417,7 @@ class MachineList extends Api
             $field = 'a.维修人员'.$i;
             $query->join("人事_基本资料 $tableNumber", "$field = {$tableNumber}.员工编号 AND {$field} IS NOT NULL", 'LEFT');
         }
-        $list = $query->order('设备编号')->select();
+        $list = $query->where($where)->order('设备编号')->select();
         if (empty($list)) {
             $this->error('未找到数据');
         }else{