mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新行政收款

Browse Source
This commit is contained in:
yaooo 2023-12-19 14:29:34 +08:00
parent df2762028d
commit a27254e08c
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/adminapi/lists/administrative/AdministrativeTicketCollectionLists.php
View File

@ -54,26 +54,18 @@ class AdministrativeTicketCollectionLists extends BaseAdminDataLists implements
*/ */
public function lists(): array 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') return Db::name('AdministrativeTicketCollection')->alias('atc')
->where($this->searchWhere) ->where($this->searchWhere)
->whereNull('er.delete_time') ->whereNull('atc.delete_time')
->leftJoin('orgs o','o.id = er.org_id') ->leftJoin('orgs o','o.id = atc.org_id')
->leftJoin('dept d','d.id = er.dept_id') ->leftJoin('dept d','d.id = atc.dept_id')
->leftJoin('custom ct','ct.id = er.customer_id') ->leftJoin('administrative_contract ac','ac.id = er.administrative_contract_id')
->field('er.*, d.name as dept_name, o.name as org_name, ct.name as customer_name') ->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) ->limit($this->limitOffset, $this->limitLength)
->order(['er.id' => 'desc']) ->order(['atc.id' => 'desc'])
->select()->each(function($item, $key){ ->select()->each(function($item, $key){
//关联数据后续添加 //关联数据后续添加
$item['approve_no'] = '付款单号'; $item['supplier_name'] = '供应商名称';
$item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1;
return $item; return $item;
}) })
->toArray(); ->toArray();
@ -88,7 +80,12 @@ class AdministrativeTicketCollectionLists extends BaseAdminDataLists implements
*/ */
public function count(): int 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();
} }
} }