update
This commit is contained in:
parent
af3151a007
commit
8ffe2ac429
@ -74,7 +74,7 @@ class BuildReportDetailLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
->limit($this->limitOffset, $this->limitLength)
|
->limit($this->limitOffset, $this->limitLength)
|
||||||
->order(['id' => 'desc'])
|
->order(['id' => 'desc'])
|
||||||
->select()->each(function($item){
|
->select()->each(function($item){
|
||||||
$report = BuildReport::field('plan_id,report_code')->where('id',$item['report_id'])->findOrEmpty();
|
$report = BuildReport::field('plan_id,report_code,create_time')->where('id',$item['report_id'])->findOrEmpty();
|
||||||
$plan = BuildPlan::field('project_id,process_id,zy_code,price')->where('id',$report['plan_id'])->findOrEmpty();
|
$plan = BuildPlan::field('project_id,process_id,zy_code,price')->where('id',$report['plan_id'])->findOrEmpty();
|
||||||
$project = Project::field('name')->where('id',$plan['project_id'])->findOrEmpty();
|
$project = Project::field('name')->where('id',$plan['project_id'])->findOrEmpty();
|
||||||
$process = BuildProcessSettings::field('division_id,process_step_no,process_step')->where('id',$plan['process_id'])->findOrEmpty();
|
$process = BuildProcessSettings::field('division_id,process_step_no,process_step')->where('id',$plan['process_id'])->findOrEmpty();
|
||||||
@ -91,6 +91,7 @@ class BuildReportDetailLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
$item['user_work_type'] = $person->work_type_text;
|
$item['user_work_type'] = $person->work_type_text;
|
||||||
$item['price'] = $plan['price'];
|
$item['price'] = $plan['price'];
|
||||||
$item['amount'] = $plan['price']*$item['work_num'];
|
$item['amount'] = $plan['price']*$item['work_num'];
|
||||||
|
$item['report_date'] = date('Y-m-d',$report['create_time']);
|
||||||
})
|
})
|
||||||
->toArray();
|
->toArray();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user