diff --git a/app/adminapi/lists/contract/ContractNegotiationLists.php b/app/adminapi/lists/contract/ContractNegotiationLists.php index 5d20b59ad..0f863998a 100644 --- a/app/adminapi/lists/contract/ContractNegotiationLists.php +++ b/app/adminapi/lists/contract/ContractNegotiationLists.php @@ -62,7 +62,8 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch ->leftJoin('contract c','c.id = cn.contract_id') ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') ->leftJoin('project p','p.id = bbbd.project_id') - ->field('cn.*, bbbd.project_id, c.contract_code, c.contract_name, p.name as project_name, p.project_code') + ->leftJoin('custom ct','ct.id = p.custom_id') + ->field('cn.*, bbbd.project_id, c.contract_code, c.contract_type, c.contract_pricing_method, c.contract_name, p.name as project_name, p.project_code, p.custom_id, ct.name as custom_name') ->limit($this->limitOffset, $this->limitLength) ->order(['cn.id' => 'desc']) ->select()->each(function($item, $key){ @@ -98,7 +99,8 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch ->leftJoin('dept d','d.id = cn.dept_id') ->leftJoin('contract c','c.id = cn.contract_id') ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') - ->leftJoin('project p','p.id = bbbd.project_id')->count(); + ->leftJoin('project p','p.id = bbbd.project_id') + ->leftJoin('custom ct','ct.id = p.custom_id')->count(); } } \ No newline at end of file