From 1aaadbb1071257e2716af176047bd7ff0acd9a9b Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 15 Dec 2023 17:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/ProcurementContractLists.php      |  6 ++++++
 .../contract/SubcontractingContractLists.php   | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php
index b058318c4..7e02f21f0 100644
--- a/app/adminapi/lists/contract/ProcurementContractLists.php
+++ b/app/adminapi/lists/contract/ProcurementContractLists.php
@@ -76,6 +76,12 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
+                if (!empty($item['pay_plan'])) {
+                    $otherContactsArray = json_decode($item['pay_plan'], true);
+                    if (is_array($otherContactsArray)) {
+                        $item['pay_plan'] = $otherContactsArray;
+                    }
+                }
                 return $item;
             })
             ->toArray();
diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php
index da91264f1..dc3452399 100644
--- a/app/adminapi/lists/contract/SubcontractingContractLists.php
+++ b/app/adminapi/lists/contract/SubcontractingContractLists.php
@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\contract\SubcontractingContract;
 use app\common\model\contract\ProcurementContract;
 use app\common\lists\ListsSearchInterface;
+use think\facade\Db;
 
 
 /**
@@ -64,11 +65,19 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
      */
     public function lists(): array
     {
-        return ProcurementContract::where($this->searchWhere)->where($this->querySearch())
-            ->field(['*'])
+        return Db::name('ProcurementContract')->alias('pc')
+            ->where($this->searchWhere)->where($this->querySearch())
+            ->leftJoin('project p','p.id = pc.project_id')
+            ->field('pc.*, p.name as project_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
+            ->order(['pc.id' => 'desc'])
             ->select()->each(function($item, $key){
+                //关联数据 供应商后续添加
+                $item['supplier_name'] = '供应商名称';
+                $item['contract_type'] = '1';
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
                 if (!empty($item['pay_plan'])) {
                     $otherContactsArray = json_decode($item['pay_plan'], true);
                     if (is_array($otherContactsArray)) {
@@ -76,7 +85,8 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
                     }
                 }
                 return $item;
-            })->toArray();
+            })
+            ->toArray();
     }