From df2412465949b2f5d7b2c3c4ad649feebc6d0399 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 8 Jan 2024 14:41:44 +0800 Subject: [PATCH] update --- app/adminapi/lists/bid/BidDocumentExaminationLists.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/bid/BidDocumentExaminationLists.php b/app/adminapi/lists/bid/BidDocumentExaminationLists.php index 61694cb2a..0246c03a7 100644 --- a/app/adminapi/lists/bid/BidDocumentExaminationLists.php +++ b/app/adminapi/lists/bid/BidDocumentExaminationLists.php @@ -16,6 +16,7 @@ namespace app\adminapi\lists\bid; use app\adminapi\lists\BaseAdminDataLists; +use app\common\model\auth\Admin; use app\common\model\bid\BidBiddingDecision; use app\common\model\bid\BidBuyBiddingDocument; use app\common\model\bid\BidDocumentExamination; @@ -77,8 +78,9 @@ class BidDocumentExaminationLists extends BaseAdminDataLists implements ListsSea ->select()->each(function($item){ $project = Project::field('custom_id,name,project_code')->where('id',$item['project_id'])->findOrEmpty(); $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); - $bid_buy_doc = BidBuyBiddingDocument::field('bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buy_date,bid_address')->where('id',$item['buy_bidding_document_id'])->findOrEmpty(); + $bid_buy_doc = BidBuyBiddingDocument::field('bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buyer,buy_date,bid_address')->where('id',$item['buy_bidding_document_id'])->findOrEmpty(); $bid_decision = BidBiddingDecision::field('bidding_project_fund_source,bidding_time,bid_type,is_margin,margin_amount,bid_opening_date')->where('id',$bid_buy_doc['bid_decision_id'])->findOrEmpty(); + $buyer = Admin::field('name')->where('id',$bid_buy_doc['buyer'])->findOrEmpty(); $item['project_name'] = $project['name']; $item['project_code'] = $project['project_code']; $item['custom_name'] = $custom['name']; @@ -87,6 +89,7 @@ class BidDocumentExaminationLists extends BaseAdminDataLists implements ListsSea $item['bid_company_name'] = $bid_buy_doc['bid_company_name']; $item['bid_address'] = $bid_buy_doc['bid_address']; $item['bidding_project_fund_source'] = $bid_decision->bidding_project_fund_source_text; + $item['buyer'] = $buyer['name']; $item['bidding_time'] = $bid_decision['bidding_time']; $item['bid_type'] = $bid_decision->bid_type_text; $item['is_margin'] = $bid_decision->is_margin_text;