From a27254e08c6db1b926dae62ceddf9d414c7f99e5 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 14:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=8C=E6=94=BF=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdministrativeTicketCollectionLists.php   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php b/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php
index 3e848bc1b..1e7d71ccb 100644
--- a/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php
+++ b/app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php
@@ -54,26 +54,18 @@ class AdministrativeTicketCollectionLists extends BaseAdminDataLists implements
      */
     public function lists(): array
     {
-        return AdministrativeTicketCollection::where($this->searchWhere)
-            ->field(['id', 'org_id', 'dept_id', 'administrative_contract_id', 'invoicing_date', 'commitor', 'invoice_type', 'invoice_sn', 'invoice_amount', 'invoice_tax_rate', 'tax', 'amount_excluding_tax', 'receipt_date', 'remark', 'annex'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
         return Db::name('AdministrativeTicketCollection')->alias('atc')
             ->where($this->searchWhere)
-            ->whereNull('er.delete_time')
-            ->leftJoin('orgs o','o.id = er.org_id')
-            ->leftJoin('dept d','d.id = er.dept_id')
-            ->leftJoin('custom ct','ct.id = er.customer_id')
-            ->field('er.*, d.name as dept_name, o.name as org_name, ct.name as customer_name')
+            ->whereNull('atc.delete_time')
+            ->leftJoin('orgs o','o.id = atc.org_id')
+            ->leftJoin('dept d','d.id = atc.dept_id')
+            ->leftJoin('administrative_contract ac','ac.id = er.administrative_contract_id')
+            ->field('atc.*, d.name as dept_name, o.name as org_name, ac.supplier_id, ac.contract_no, ac.contract_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['er.id' => 'desc'])
+            ->order(['atc.id' => 'desc'])
             ->select()->each(function($item, $key){
                 //关联数据后续添加               
-                $item['approve_no'] = '付款单号';
-                $item['approve_step'] = '流程步骤';
-                $item['approve_settle_status'] = 1;
+                $item['supplier_name'] = '供应商名称';
                 return $item;
             })
             ->toArray();
@@ -88,7 +80,12 @@ class AdministrativeTicketCollectionLists extends BaseAdminDataLists implements
      */
     public function count(): int
     {
-        return AdministrativeTicketCollection::where($this->searchWhere)->count();
+        return Db::name('AdministrativeTicketCollection')->alias('atc')
+        ->where($this->searchWhere)
+        ->whereNull('atc.delete_time')
+        ->leftJoin('orgs o','o.id = atc.org_id')
+        ->leftJoin('dept d','d.id = atc.dept_id')
+        ->leftJoin('administrative_contract ac','ac.id = er.administrative_contract_id')->count();
     }
 
 }
\ No newline at end of file