From 3d482440ca0db1354610f6272044a7bbd39a20da Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 16 Dec 2023 10:36:05 +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

---
 app/adminapi/lists/contract/ContractLists.php | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php
index 61ff54c13..6d1f1b770 100644
--- a/app/adminapi/lists/contract/ContractLists.php
+++ b/app/adminapi/lists/contract/ContractLists.php
@@ -18,7 +18,7 @@ namespace app\adminapi\lists\contract;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\contract\Contract;
 use app\common\lists\ListsSearchInterface;
-
+use think\facade\Db;
 
 /**
  * 项目合同列表
@@ -54,11 +54,21 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return Contract::where($this->searchWhere)
-            ->field(['*'])
+        return Db::name('Contract')->alias('c')
+            ->where($this->searchWhere)
+            ->leftJoin('bid_buy_bidding_document bbbd','c.id = c.buy_bidding_document_id')
+            ->leftJoin('project p','p.id = bbbd.project_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
+            ->field('c.*, bbbd.project_id, p.name as project_name, ct.name as custom_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['approve_id' => 'desc'])
-            ->select()
+            ->order(['c.id' => 'desc'])
+            ->select()->each(function($item, $key){
+                //关联数据 供应商后续添加               
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
             ->toArray();
     }