From 5e99f5cef0e6bad8270abdf6ba4699f7240eb16b Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 11 Dec 2023 10:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=95=E6=A0=87=E5=86=B3?=
=?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lists/bid/BidBiddingDecisionLists.php | 2 +-
.../logic/bid/BidBiddingDecisionLogic.php | 18 ++++++++++--------
.../bid/BidBiddingDecisionValidate.php | 2 ++
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/adminapi/lists/bid/BidBiddingDecisionLists.php b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
index 8e4895a3c..74d1cf07a 100644
--- a/app/adminapi/lists/bid/BidBiddingDecisionLists.php
+++ b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
@@ -38,7 +38,7 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
public function setSearch(): array
{
return [
- '=' => ['project_id'],
+ '=' => ['project_id', 'bidding_project_fund_source', 'bid_type'],
];
}
diff --git a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
index c96aef76e..af7c5c9ba 100644
--- a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
+++ b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
@@ -42,16 +42,17 @@ class BidBiddingDecisionLogic extends BaseLogic
try {
BidBiddingDecision::create([
'project_id' => $params['project_id'],
+ 'approve_id' => $params['approve_id'],
'project_estimation' => $params['project_estimation'],
'bidding_project_fund_source' => $params['bidding_project_fund_source'],
- 'bidding_time' => $params['bidding_time'],
- 'buy_bid_document_date' => $params['buy_bid_document_date'],
+ 'bidding_time' => strtotime($params['bidding_time']),
+ 'buy_bid_document_date' => strtotime($params['buy_bid_document_date']),
'bid_type' => $params['bid_type'],
'competitor' => $params['competitor'],
'is_margin' => $params['is_margin'],
'margin_amount' => $params['margin_amount'],
- 'bid_opening_date' => $params['bid_opening_date'],
- 'margin_amount_return_date' => $params['margin_amount_return_date'],
+ 'bid_opening_date' => strtotime($params['bid_opening_date']),
+ 'margin_amount_return_date' => strtotime($params['margin_amount_return_date']),
'is_internal_resources' => $params['is_internal_resources'],
'project_assurance' => $params['project_assurance'],
'bid_project_overview' => $params['bid_project_overview'],
@@ -82,16 +83,17 @@ class BidBiddingDecisionLogic extends BaseLogic
try {
BidBiddingDecision::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
+ 'approve_id' => $params['approve_id'],
'project_estimation' => $params['project_estimation'],
'bidding_project_fund_source' => $params['bidding_project_fund_source'],
- 'bidding_time' => $params['bidding_time'],
- 'buy_bid_document_date' => $params['buy_bid_document_date'],
+ 'bidding_time' => strtotime($params['bidding_time']),
+ 'buy_bid_document_date' => strtotime($params['buy_bid_document_date']),
'bid_type' => $params['bid_type'],
'competitor' => $params['competitor'],
'is_margin' => $params['is_margin'],
'margin_amount' => $params['margin_amount'],
- 'bid_opening_date' => $params['bid_opening_date'],
- 'margin_amount_return_date' => $params['margin_amount_return_date'],
+ 'bid_opening_date' => strtotime($params['bid_opening_date']),
+ 'margin_amount_return_date' => strtotime($params['margin_amount_return_date']),
'is_internal_resources' => $params['is_internal_resources'],
'project_assurance' => $params['project_assurance'],
'bid_project_overview' => $params['bid_project_overview'],
diff --git a/app/adminapi/validate/bid/BidBiddingDecisionValidate.php b/app/adminapi/validate/bid/BidBiddingDecisionValidate.php
index 6bb55f3ad..d98bbc682 100644
--- a/app/adminapi/validate/bid/BidBiddingDecisionValidate.php
+++ b/app/adminapi/validate/bid/BidBiddingDecisionValidate.php
@@ -32,6 +32,7 @@ class BidBiddingDecisionValidate extends BaseValidate
*/
protected $rule = [
'id' => 'require',
+ 'project_estimation' => 'require',
];
@@ -41,6 +42,7 @@ class BidBiddingDecisionValidate extends BaseValidate
*/
protected $field = [
'id' => 'id',
+ 'project_estimation' => '项目估算',
];