From ca33c29c433e0c671c62e0f1e3b7651afbbcbd60 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 30 Jan 2024 11:45:19 +0800
Subject: [PATCH] update
---
app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php | 3 +--
app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
index d7f8e065f..8fe9fe1c1 100644
--- a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
+++ b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
@@ -75,7 +75,7 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
$project_ids = Project::where('custom_id',$params['custom_id'])->column('id');
$where[] = ['project_id','in',$project_ids];
}
- return BidBuyBiddingDocument::field('id,project_id,bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buyer,amount,buy_date,bid_address')
+ return BidBuyBiddingDocument::field('id,project_id,bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buyer,amount,buy_date')
->where($this->searchWhere)->where($where)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
@@ -153,7 +153,6 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
'bidding_time' => '投标时间',
'buy_date' => '购买标书时间',
'bid_type' => '招标方式',
- 'bid_address' => '投标地址',
];
}
}
\ No newline at end of file
diff --git a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
index acf8bf945..9ad087ff6 100644
--- a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
+++ b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
@@ -53,7 +53,6 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
'buyer' => $params['buyer'] ?? 0,
'amount' => $params['amount'] ?? 0,
'buy_date' => !empty($params['buy_date']) ? strtotime($params['buy_date']) : 0,
- 'bid_address' => $params['bid_address'] ?? '',
]);
Db::commit();
return true;
@@ -84,7 +83,6 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
'buyer' => $params['buyer'] ?? 0,
'amount' => $params['amount'] ?? 0,
'buy_date' => !empty($params['buy_date']) ? strtotime($params['buy_date']) : 0,
- 'bid_address' => $params['bid_address'] ?? '',
'update_time' => time(),
]);
Db::commit();
@@ -119,7 +117,7 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
*/
public static function detail($params): array
{
- $data = BidBuyBiddingDocument::field('id,project_id,bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buyer,amount,buy_date,bid_address')->findOrEmpty($params['id']);
+ $data = BidBuyBiddingDocument::field('id,project_id,bid_decision_id,bid_document_no,invite_tenders_company_name,bid_company_name,buyer,amount,buy_date')->findOrEmpty($params['id']);
$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_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();