From 251407de86eccfb35fa9289921468b076281fdbd Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 15:45:30 +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/BidBiddingDecisionLists.php     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/adminapi/lists/bid/BidBiddingDecisionLists.php b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
index e56cfef0c..0ca0a5f9a 100644
--- a/app/adminapi/lists/bid/BidBiddingDecisionLists.php
+++ b/app/adminapi/lists/bid/BidBiddingDecisionLists.php
@@ -18,6 +18,7 @@ namespace app\adminapi\lists\bid;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\bid\BidBiddingDecision;
 use app\common\lists\ListsSearchInterface;
+use think\facade\Db;
 
 
 /**
@@ -38,7 +39,7 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
     public function setSearch(): array
     {
         return [
-            '=' => ['project_id', 'bidding_project_fund_source', 'bid_type'],
+            '=' => ['bbd.project_id', 'bbd.bidding_project_fund_source', 'bbd.bid_type'],
         ];
     }
 
@@ -54,11 +55,20 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function lists(): array
     {
-        return BidBiddingDecision::where($this->searchWhere)
-            ->field(['*'])
+        return Db::name('BidBiddingDecision')->alias('bbd')
+            ->where($this->searchWhere)
+            ->whereNull('bbd.delete_time')
+            ->leftJoin('project p','p.id = bbd.project_id')
+            ->field('bbd.*, p.name as project_name, p.project_code')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
+            ->order(['bbd.id' => 'desc'])
+            ->select()->each(function($item, $key){
+                //关联数据后续添加               
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
             ->toArray();
     }
 
@@ -71,7 +81,10 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function count(): int
     {
-        return BidBiddingDecision::where($this->searchWhere)->count();
+        return Db::name('BidBiddingDecision')->alias('bbd')
+        ->where($this->searchWhere)
+        ->whereNull('bbd.delete_time')
+        ->leftJoin('project p','p.id = bbd.project_id')->count();
     }
 
 }
\ No newline at end of file