From 5747ccd6d5941b42009bb30e7709f86282090028 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 18 Dec 2023 10:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/bid/BidBuyBiddingDocumentLists.php   | 18 ++++++++++++++----
 .../logic/bid/BidBuyBiddingDocumentLogic.php   |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
index 5e2c07484..2308e3f61 100644
--- a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
+++ b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
@@ -54,10 +54,20 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
      */
     public function lists(): array
     {
-        return BidBuyBiddingDocument::where($this->searchWhere)
-            ->field(['*'])->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
+        return Db::name('BidBuyBiddingDocument')->alias('bbbd')
+            ->where($this->searchWhere)
+            ->leftJoin('project p','p.id = bbbd.project_id')
+            ->leftJoin('custom ct','ct.id = p.custom_id')
+            ->field('bsa.*, bbbd.project_id, p.name as project_name, ct.name as customer_name')
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['bbbd.id' => 'desc'])
+            ->select()->each(function($item, $key){
+                //关联数据 供应商后续添加               
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
             ->toArray();
     }
 
diff --git a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
index a89df663d..7e09b9b38 100644
--- a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
+++ b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
@@ -134,11 +134,11 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
     public static function detail($params): array
     {
         $bidBuyBiddingDocument = BidBuyBiddingDocument::findOrEmpty($params['id']);
+        $bidBuyBiddingDocument->project;
         $bidBuyBiddingDocument->custom = null;
         if (!empty($bidBuyBiddingDocument->project->custom_id)) {
             $bidBuyBiddingDocument->custom = Custom::findOrEmpty($bidBuyBiddingDocument->project->custom_id);
         }
-        $bidBuyBiddingDocument->project;
         return $bidBuyBiddingDocument->toArray();
     }
 }
\ No newline at end of file