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

Merge pull request 'update' (#120) from zhangwei into dev

Browse Source 
Reviewed-on: #120
This commit is contained in:
weiz 2024-01-06 10:59:49 +08:00
commit bf57955ce6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
View File

@ -132,7 +132,7 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
$dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();
$project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
$bid_decision = BidBiddingDecision::field('code,bidding_time,bid_type,is_margin,margin_amount,bid_opening_date,margin_amount_return_date,bid_project_overview,project_desc,annex')->where('id',$data['bid_decision_id'])->findOrEmpty();
$bid_decision = BidBiddingDecision::field('code,bidding_project_fund_source,bidding_time,bid_type,is_margin,margin_amount,bid_opening_date,margin_amount_return_date,bid_project_overview,project_desc,annex')->where('id',$data['bid_decision_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['buyer'])->findOrEmpty();
$data['org_name'] = $org['name'];
$data['dept_name'] = $dept['name'];
@ -141,6 +141,7 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
$data['custom_name'] = $custom['name'];
$data['bid_decision_code'] = $bid_decision['code'];
$data['bidding_time'] = $bid_decision['bidding_time'];
$data['bidding_project_fund_source'] = $bid_decision->bidding_project_fund_source_text;
$data['bid_type'] = $bid_decision->bid_type_text;
$data['is_margin'] = $bid_decision->is_margin_text;
$data['margin_amount'] = $bid_decision['margin_amount'];