|
@@ -88,7 +88,7 @@ class DeviceDepreciationService extends Service
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
|
|
|
$id = array_column($data,'device_id');
|
|
$id = array_column($data,'device_id');
|
|
|
- $map = Device::whereIn('id', $id)->select('title','id','code')->get()->toArray();
|
|
|
|
|
|
|
+ $map = Device::whereIn('id', $id)->select('title','id','code','type')->get()->toArray();
|
|
|
$map = array_column($map,null,'id');
|
|
$map = array_column($map,null,'id');
|
|
|
|
|
|
|
|
foreach ($data as $key => $value){
|
|
foreach ($data as $key => $value){
|
|
@@ -96,6 +96,7 @@ class DeviceDepreciationService extends Service
|
|
|
$merge = [];
|
|
$merge = [];
|
|
|
$merge['device_title'] = $tmp['title'];
|
|
$merge['device_title'] = $tmp['title'];
|
|
|
$merge['device_code'] = $tmp['code'];
|
|
$merge['device_code'] = $tmp['code'];
|
|
|
|
|
+ $merge['type_title'] = Device::$type[$tmp['type']] ?? "";
|
|
|
$data[$key] = array_merge($value, $merge);
|
|
$data[$key] = array_merge($value, $merge);
|
|
|
}
|
|
}
|
|
|
|
|
|
