|
@@ -100,7 +100,7 @@ class DeviceWorkService extends Service
|
|
|
$tmp = $map[$value['device_id']] ?? [];
|
|
$tmp = $map[$value['device_id']] ?? [];
|
|
|
$merge = [];
|
|
$merge = [];
|
|
|
$merge['device_title'] = $tmp['title'];
|
|
$merge['device_title'] = $tmp['title'];
|
|
|
- $merge['device_number'] = $tmp['code'];
|
|
|
|
|
|
|
+ $merge['device_code'] = $tmp['code'];
|
|
|
$merge['start_time'] = date("Y-m-d", $value['start_time']);
|
|
$merge['start_time'] = date("Y-m-d", $value['start_time']);
|
|
|
$merge['end_time'] = date("Y-m-d", $value['end_time']);
|
|
$merge['end_time'] = date("Y-m-d", $value['end_time']);
|
|
|
$data[$key] = array_merge($value, $merge);
|
|
$data[$key] = array_merge($value, $merge);
|
|
@@ -297,7 +297,7 @@ class DeviceWorkService extends Service
|
|
|
|
|
|
|
|
// 组装每一行详情需要展示的字段
|
|
// 组装每一行详情需要展示的字段
|
|
|
$res[$item->main_id][] = [
|
|
$res[$item->main_id][] = [
|
|
|
- 'device_number' => $tmpEmp ? $tmpEmp->number : '',
|
|
|
|
|
|
|
+ 'device_code' => $tmpEmp ? $tmpEmp->number : '',
|
|
|
'total_days' => $item->total_days,
|
|
'total_days' => $item->total_days,
|
|
|
'rd_total_days' => $item->rd_total_days,
|
|
'rd_total_days' => $item->rd_total_days,
|
|
|
'total_hours' => $item->total_hours,
|
|
'total_hours' => $item->total_hours,
|
