mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-01-25 09:37:02 +08:00
parent 689beaf364
commit fbc4b19d7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/logic/build/BuildPlanLogic.php
View File

@ -130,7 +130,7 @@ class BuildPlanLogic extends BaseLogic
$data = BuildPlan::field($field)->findOrEmpty($params['id']); $data = BuildPlan::field($field)->findOrEmpty($params['id']);
if(empty($data)) return []; if(empty($data)) return [];
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,file')->where('id',$data['process_id'])->findOrEmpty(); $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id',$data['process_id'])->findOrEmpty();
$division = BuildDivision::field('subentry_engineering,subentry_engineering_code')->where('id',$process['division_id'])->findOrEmpty(); $division = BuildDivision::field('subentry_engineering,subentry_engineering_code')->where('id',$process['division_id'])->findOrEmpty();
$projectMember = ProjectMember::field('admin_id')->where('id',$data['project_member_id'])->findOrEmpty(); $projectMember = ProjectMember::field('admin_id')->where('id',$data['project_member_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$projectMember['admin_id'])->findOrEmpty(); $admin = Admin::field('name')->where('id',$projectMember['admin_id'])->findOrEmpty();
@ -141,7 +141,7 @@ class BuildPlanLogic extends BaseLogic
$data['process_step_no'] = $process['process_step_no']; $data['process_step_no'] = $process['process_step_no'];
$data['process_step'] = $process['process_step']; $data['process_step'] = $process['process_step'];
$data['quality_control_points'] = $process['quality_control_points']; $data['quality_control_points'] = $process['quality_control_points'];
$data['file'] = $process['file']; $data['file'] = $process['annex'];
$data['project_member_name'] = $admin['name']; $data['project_member_name'] = $admin['name'];
$data['done_workload'] = BuildReport::where('plan_id',$data['id'])->sum('report_workload'); $data['done_workload'] = BuildReport::where('plan_id',$data['id'])->sum('report_workload');
$data['residue_workload'] = ($data['workload'] - $data['done_workload']) <=0 ? 0 : $data['workload'] - $data['done_workload']; $data['residue_workload'] = ($data['workload'] - $data['done_workload']) <=0 ? 0 : $data['workload'] - $data['done_workload'];