From 64159413e1fce7337d2444280aafc2e42e9bfeff Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 18 Dec 2023 14:32:46 +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

---
 .../finance/FinanceReturnedMoneyLists.php     | 24 +++++++++++++++----
 .../finance/FinanceReturnedMoneyLogic.php     |  5 ++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
index 38e7e4751..2315e9331 100644
--- a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
@@ -17,7 +17,10 @@ namespace app\adminapi\lists\finance;
 
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\finance\FinanceReturnedMoney;
+use app\common\model\project\Project;
+use app\common\model\custom\Custom;
 use app\common\lists\ListsSearchInterface;
+use think\facade\Db;
 
 
 /**
@@ -38,7 +41,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['customer_id', 'contract_id'],
+            '=' => ['frd.customer_id', 'frd.contract_id'],
         ];
     }
 
@@ -54,11 +57,22 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
      */
     public function lists(): array
     {
-        return FinanceReturnedMoney::where($this->searchWhere)
-            ->field(['*'])
+        return Db::name('FinanceReturnedMoney')->alias('frd')
+            ->where($this->searchWhere)
+            ->leftJoin('contract c','c.id = frd.contract_id')
+            ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
+            ->leftJoin('project p','p.id = bbbd.project_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
+            ->field('frd.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
+            ->order(['frd.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/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
index d573cf37d..eb7a2dc1e 100644
--- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
@@ -17,6 +17,8 @@ namespace app\adminapi\logic\finance;
 
 use app\common\model\finance\FinanceReturnedMoney;
 use app\common\logic\BaseLogic;
+use app\common\model\project\Project;
+use app\common\model\custom\Custom;
 use think\facade\Db;
 
 
@@ -120,6 +122,9 @@ class FinanceReturnedMoneyLogic extends BaseLogic
         $financeReturnedMoney = FinanceReturnedMoney::findOrEmpty($params['id']);
         $financeReturnedMoney->contract;
         $financeReturnedMoney->custom;
+        $financeReturnedMoney->document =  $financeReturnedMoney->contract->document;
+        $financeReturnedMoney->project = $financeReturnedMoney->document->project;
+        unset($financeReturnedMoney->contract->document, $financeReturnedMoney->document->project);
         return $financeReturnedMoney->toArray();
     }
 }
\ No newline at end of file