设备管理

application/api/controller/MachineList.php

@@ -401,7 +401,7 @@ class MachineList extends Api
             ->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 验收情况,
+            ->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');
         for($i=1;$i<=4;$i++){