diff --git a/app/adminapi/lists/build/BuildReportLists.php b/app/adminapi/lists/build/BuildReportLists.php index 28c4f10d0..22db46067 100644 --- a/app/adminapi/lists/build/BuildReportLists.php +++ b/app/adminapi/lists/build/BuildReportLists.php @@ -74,7 +74,7 @@ class BuildReportLists extends BaseAdminDataLists implements ListsSearchInterfac ->select()->each(function($data){ $plan = BuildPlan::where('id',$data['plan_id'])->findOrEmpty(); $project = Project::field('name')->where('id',$plan['project_id'])->findOrEmpty(); - $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,file')->where('id',$plan['process_id'])->findOrEmpty(); + $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id',$plan['process_id'])->findOrEmpty(); $division = BuildDivision::field('subentry_engineering')->where('id',$process['division_id'])->findOrEmpty(); $projectMember = ProjectMember::field('admin_id')->where('id',$plan['project_member_id'])->findOrEmpty(); $admin = Admin::field('name')->where('id','in',[$projectMember['admin_id'],$data['add_user']])->column('name','id'); @@ -84,7 +84,7 @@ class BuildReportLists extends BaseAdminDataLists implements ListsSearchInterfac $data['process_step'] = $process['process_step']; $data['process_step_no'] = $process['process_step_no']; $data['quality_control_points'] = $process['quality_control_points']; - $data['process_file'] = $process['file']; + $data['process_file'] = $process['annex']; $data['project_member_name'] = $admin[$projectMember['admin_id']]; $data['work_user'] = $plan['work_user']; $data['work_content'] = $plan['work_content']; diff --git a/app/adminapi/logic/build/BuildReportLogic.php b/app/adminapi/logic/build/BuildReportLogic.php index 5ea90bec9..ff86fad81 100644 --- a/app/adminapi/logic/build/BuildReportLogic.php +++ b/app/adminapi/logic/build/BuildReportLogic.php @@ -87,7 +87,7 @@ class BuildReportLogic extends BaseLogic if(empty($data)) return []; $plan = BuildPlan::where('id',$data['plan_id'])->findOrEmpty(); $project = Project::field('name')->where('id',$plan['project_id'])->findOrEmpty(); - $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,file')->where('id',$plan['process_id'])->findOrEmpty(); + $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id',$plan['process_id'])->findOrEmpty(); $division = BuildDivision::field('subentry_engineering')->where('id',$process['division_id'])->findOrEmpty(); $projectMember = ProjectMember::field('admin_id')->where('id',$plan['project_member_id'])->findOrEmpty(); $admin = Admin::field('name')->where('id','in',[$projectMember['admin_id'],$data['add_user']])->column('name','id'); @@ -97,7 +97,7 @@ class BuildReportLogic extends BaseLogic $data['process_step'] = $process['process_step']; $data['process_step_no'] = $process['process_step_no']; $data['quality_control_points'] = $process['quality_control_points']; - $data['process_file'] = $process['file']; + $data['process_file'] = $process['annex']; $data['project_member_name'] = $admin[$projectMember['admin_id']]; $data['work_user'] = $plan['work_user']; $data['work_content'] = $plan['work_content'];