update
This commit is contained in:
parent
d47f792dc7
commit
c8357a6bd1
@ -17,8 +17,7 @@ namespace app\adminapi\lists\project;
|
||||
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\contract\Contract;
|
||||
use app\common\model\contract\ProcurementContract;
|
||||
use app\common\model\contract\SubcontractingContract;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectSubcontractSettlement;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
@ -66,12 +65,12 @@ class ProjectSubcontractSettlementLists extends BaseAdminDataLists implements Li
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function($item){
|
||||
$project = Project::field('name')->where('id',$item['project_id'])->findOrEmpty();
|
||||
$contract = ProcurementContract::field('supplier_id,contract_amount,contract_no')->where('id',$item['contract_id'])->findOrEmpty();
|
||||
$contract = SubcontractingContract::field('supplier_id,contract_amount,contract_no')->where('id',$item['contract_id'])->findOrEmpty();
|
||||
$supplier = Supplier::field('supplier_code,supplier_name')->where('id',$contract['supplier_id'])->findOrEmpty();
|
||||
$admin = Admin::field('name')->where('id',$item['add_user'])->findOrEmpty();
|
||||
$item['supplier_name'] = $supplier['supplier_name'];
|
||||
$item['project_name'] = $project['name'];
|
||||
$item['contract_code'] = $contract['contract_code'];
|
||||
$item['contract_code'] = $contract['contract_no'];
|
||||
$item['contract_amount'] = $contract['contract_amount'];
|
||||
$item['add_user_name'] = $admin['name'];
|
||||
unset($item['project_id'],$item['contract_id'],$item['add_user']);
|
||||
|
Loading…
x
Reference in New Issue
Block a user