From 03a1fafe1d330e820e0b60a4d799c285d96dd835 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 11 Dec 2023 16:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E4=B9=A6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/bid/BidResultLogic.php     | 37 ++++++++++---------
 .../validate/bid/BidResultValidate.php        |  7 +++-
 app/common/model/bid/BidResult.php            | 12 +++++-
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/adminapi/logic/bid/BidResultLogic.php b/app/adminapi/logic/bid/BidResultLogic.php
index 49cf7b7d9..1d8097ed2 100644
--- a/app/adminapi/logic/bid/BidResultLogic.php
+++ b/app/adminapi/logic/bid/BidResultLogic.php
@@ -41,14 +41,14 @@ class BidResultLogic extends BaseLogic
         Db::startTrans();
         try {
             BidResult::create([
-                'bid_document_examination_id' => $params['bid_document_examination_id'],
-                'project_id' => $params['project_id'],
-                'is_successful' => $params['is_successful'],
-                'bidder' => $params['bidder'],
-                'bidder_amount' => $params['bidder_amount'],
-                'bidder_amount_daxie' => $params['bidder_amount_daxie'],
-                'bid_summary' => $params['bid_summary'],
-                'annex' => $params['annex']
+                'bid_document_examination_id' => $params['bid_document_examination_id'] ?? 0,
+                'project_id' => $params['project_id'] ?? 0,
+                'is_successful' => $params['is_successful'] ?? 0,
+                'bidder' => $params['bidder'] ?? '',
+                'bidder_amount' => $params['bidder_amount'] ?? 0,
+                'bidder_amount_daxie' => $params['bidder_amount_daxie'] ?? '',
+                'bid_summary' => $params['bid_summary'] ?? '',
+                'annex' => $params['annex'] ?? '',
             ]);
 
             Db::commit();
@@ -73,14 +73,14 @@ class BidResultLogic extends BaseLogic
         Db::startTrans();
         try {
             BidResult::where('id', $params['id'])->update([
-                'bid_document_examination_id' => $params['bid_document_examination_id'],
-                'project_id' => $params['project_id'],
-                'is_successful' => $params['is_successful'],
-                'bidder' => $params['bidder'],
-                'bidder_amount' => $params['bidder_amount'],
-                'bidder_amount_daxie' => $params['bidder_amount_daxie'],
-                'bid_summary' => $params['bid_summary'],
-                'annex' => $params['annex']
+                'bid_document_examination_id' => $params['bid_document_examination_id'] ?? 0,
+                'project_id' => $params['project_id'] ?? 0,
+                'is_successful' => $params['is_successful'] ?? 0,
+                'bidder' => $params['bidder'] ?? '',
+                'bidder_amount' => $params['bidder_amount'] ?? 0,
+                'bidder_amount_daxie' => $params['bidder_amount_daxie'] ?? '',
+                'bid_summary' => $params['bid_summary'] ?? '',
+                'annex' => $params['annex'] ?? '',
             ]);
 
             Db::commit();
@@ -115,6 +115,9 @@ class BidResultLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return BidResult::findOrEmpty($params['id'])->toArray();
+        $bidResult = BidResult::findOrEmpty($params['id']);
+        $bidResult->project = $bidResult->project;
+        $bidResult->examination = $bidResult->examination;
+        return $bidResult->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/validate/bid/BidResultValidate.php b/app/adminapi/validate/bid/BidResultValidate.php
index 1f14ae9b3..32a8b8312 100644
--- a/app/adminapi/validate/bid/BidResultValidate.php
+++ b/app/adminapi/validate/bid/BidResultValidate.php
@@ -32,6 +32,11 @@ class BidResultValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
+        'project_id' => 'require',
+        'bid_document_examination_id'=> 'require',
+        'is_successful' => 'require',
+        'bidder' => 'require',
+        'bidder_amount' => 'require',
     ];
 
 
@@ -64,7 +69,7 @@ class BidResultValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id']);
+        return $this->only(['id', 'is_successful', 'bidder', 'bidder_amount']);
     }
 
 
diff --git a/app/common/model/bid/BidResult.php b/app/common/model/bid/BidResult.php
index 0be773d63..6b6bac91f 100644
--- a/app/common/model/bid/BidResult.php
+++ b/app/common/model/bid/BidResult.php
@@ -16,7 +16,7 @@ namespace app\common\model\bid;
 
 
 use app\common\model\BaseModel;
-
+use think\model\concern\SoftDelete;
 
 
 /**
@@ -27,8 +27,18 @@ use app\common\model\BaseModel;
 class BidResult extends BaseModel
 {
     
+    use SoftDelete;
     protected $name = 'bid_result';
+    protected $deleteTime = 'delete_time';
     
+    public function project()
+    {
+        return $this->belongsTo(\app\common\model\project\Project::class, 'project_id');
+    }
 
+    public function examination()
+    {
+        return $this->belongsTo(\app\common\model\bid\BidDocumentExamination::class, 'bid_document_examination_id');
+    }
     
 }
\ No newline at end of file