|
|
@@ -444,7 +444,7 @@ class MachineList extends Api
|
|
|
}
|
|
|
$fields = 'rtrim(a.设备编号) as 设备编号,rtrim(a.设备名称) as 设备名称,rtrim(a.使用部门) as 使用部门,rtrim(a.保养类型) as 保养类型,a.保养开始时间,a.保养结束时间,
|
|
|
a.保养工时,rtrim(b.员工姓名) as 执行机修,rtrim(c.员工姓名) as 执行机长,rtrim(a.保养备注) as 保养备注,d.员工姓名 as 验收人员,rtrim(a.验收情况) as 验收情况,
|
|
|
- rtrim(a.sys_id) as 创建用户,a.sys_rq as 创建时间,a.UniqId';
|
|
|
+ rtrim(a.验收备注) as 验收备注,rtrim(a.sys_id) as 创建用户,a.sys_rq as 创建时间,a.UniqId';
|
|
|
$query = db('设备_保养记录')
|
|
|
->alias('a')
|
|
|
->join('人事_基本资料 b','a.执行机修 = b.员工编号','left')
|
