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:10:49 +08:00
parent f549dbb194
commit 63aed90d9a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/lists/expense/ExpenseReimbursementLists.php
View File

@ -56,6 +56,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
{
return Db::name('ExpenseReimbursement')->alias('er')
->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')
@ -81,7 +82,12 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
*/
public function count(): int
{
return ExpenseReimbursement::where($this->searchWhere)->count();
return Db::name('ExpenseReimbursement')->alias('er')
->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')->count();
}
}

2
app/adminapi/lists/finance/FinancePaymentApplyLists.php
View File

@ -57,6 +57,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinancePaymentApply')->alias('fpa')
->where($this->searchWhere)
->whereNull('fpa.delete_time')
->leftJoin('procurement_contract pc','pc.id = fpa.contract_id')
->leftJoin('project p','p.id = pc.project_id')
->field('fpa.*, p.id as project_id, p.name as project_name, p.project_code, pc.contract_no')
@ -85,6 +86,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinancePaymentApply')->alias('fpa')
->where($this->searchWhere)
->whereNull('fpa.delete_time')
->leftJoin('procurement_contract pc','pc.id = fpa.contract_id')
->leftJoin('project p','p.id = pc.project_id')->count();
}