From 3cb8dea88333db91f2ad078027b805fc39558985 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 25 Dec 2023 13:58:26 +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/bill/RedemptionBillLists.php | 3 ++-
 app/adminapi/lists/bill/TransferBillLists.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/bill/RedemptionBillLists.php b/app/adminapi/lists/bill/RedemptionBillLists.php
index a0daea75c..931b061a8 100644
--- a/app/adminapi/lists/bill/RedemptionBillLists.php
+++ b/app/adminapi/lists/bill/RedemptionBillLists.php
@@ -60,7 +60,8 @@ class RedemptionBillLists extends BaseAdminDataLists implements ListsSearchInter
             ->leftJoin('orgs o','o.id = rb.org_id')
             ->leftJoin('dept d','d.id = rb.dept_id')
             ->leftJoin('acceptance_bill ab','ab.id = rb.acceptance_bill_id')
-            ->field('rb.*, d.name as dept_name, o.name as org_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date')
+            ->leftJoin('bank_account ba','ba.id = ab.bank_account_id')
+            ->field('rb.*, d.name as dept_name, o.name as org_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date, ba.deposit_bank, ba.account_name, ba.account')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['rb.id' => 'desc'])
             ->select()->each(function($item, $key){
diff --git a/app/adminapi/lists/bill/TransferBillLists.php b/app/adminapi/lists/bill/TransferBillLists.php
index 3bd8b176e..450ff0098 100644
--- a/app/adminapi/lists/bill/TransferBillLists.php
+++ b/app/adminapi/lists/bill/TransferBillLists.php
@@ -62,7 +62,8 @@ class TransferBillLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->leftJoin('procurement_contract pc','pc.id = tb.procurement_contract_id')
             ->leftJoin('project p','p.id = pc.project_id')
             ->leftJoin('acceptance_bill ab','ab.id = tb.acceptance_bill_id')
-            ->field('tb.*, d.name as dept_name, o.name as org_name, p.name as project_name, pc.contract_no, pc.contract_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date')
+            ->leftJoin('bank_account ba','ba.id = ab.bank_account_id')
+            ->field('tb.*, d.name as dept_name, o.name as org_name, p.name as project_name, pc.contract_no, pc.contract_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date, ba.deposit_bank, ba.account_name, ba.account')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['tb.id' => 'desc'])
             ->select()->each(function($item, $key){