diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php index 41240e48a..d137a181f 100644 --- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php @@ -64,10 +64,12 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List ->order(['id' => 'desc']) ->select()->each(function($data){ $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty(); + $material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty(); $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty(); $data['project_name'] = $project['project_name']; $data['company_name'] = $company['unit_name']; + $data['material_entry_code'] = $material_entry['code']; + $data['theme'] = $material_entry['theme']; $data['enter_time'] = $material_entry['enter_time']; }) ->toArray();