This commit is contained in:
weiz 2024-01-25 09:36:14 +08:00
parent c53744db2e
commit 689beaf364

View File

@ -67,7 +67,7 @@ class BuildPlanLists extends BaseAdminDataLists implements ListsSearchInterface
->order(['id' => 'desc'])
->select()->each(function($item){
$project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty();
$process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,file')->where('id',$item['process_id'])->findOrEmpty();
$process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id',$item['process_id'])->findOrEmpty();
$division = BuildDivision::field('subentry_engineering,subentry_engineering_code')->where('id',$process['division_id'])->findOrEmpty();
$projectMember = ProjectMember::field('admin_id')->where('id',$item['project_member_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$projectMember['admin_id'])->findOrEmpty();
@ -78,7 +78,7 @@ class BuildPlanLists extends BaseAdminDataLists implements ListsSearchInterface
$item['process_step_no'] = $process['process_step_no'];
$item['process_step'] = $process['process_step'];
$item['quality_control_points'] = $process['quality_control_points'];
$item['file'] = $process['file'];
$item['file'] = $process['annex'];
$item['project_member_name'] = $admin['name'];
$item['done_workload'] = BuildReport::where('plan_id',$item['id'])->sum('report_workload');
$item['residue_workload'] = ($item['workload'] - $item['done_workload']) <=0 ? 0 : $item['workload'] - $item['done_workload'];