diff --git a/app/adminapi/lists/finance/FinancePaymentApplyLists.php b/app/adminapi/lists/finance/FinancePaymentApplyLists.php index 3d185a588..52cf078f3 100644 --- a/app/adminapi/lists/finance/FinancePaymentApplyLists.php +++ b/app/adminapi/lists/finance/FinancePaymentApplyLists.php @@ -83,7 +83,10 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch */ public function count(): int { - return FinancePaymentApply::where($this->searchWhere)->count(); + return Db::name('FinancePaymentApply')->alias('fpa') + ->where($this->searchWhere) + ->leftJoin('procurement_contract pc','pc.id = fpa.contract_id') + ->leftJoin('project p','p.id = pc.project_id')->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinancePaymentPlanLists.php b/app/adminapi/lists/finance/FinancePaymentPlanLists.php index 3797223eb..acb7109e7 100644 --- a/app/adminapi/lists/finance/FinancePaymentPlanLists.php +++ b/app/adminapi/lists/finance/FinancePaymentPlanLists.php @@ -79,7 +79,10 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI */ public function count(): int { - return FinancePaymentPlan::where($this->searchWhere)->count(); + return Db::name('FinancePaymentPlan')->alias('fpp') + ->where($this->searchWhere) + ->leftJoin('procurement_contract pc','pc.id = fpp.contract_id') + ->leftJoin('project p','p.id = pc.project_id')->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php index 6155b90fc..bee83312f 100644 --- a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php +++ b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php @@ -80,7 +80,10 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc */ public function count(): int { - return FinanceReceiptRecord::where($this->searchWhere)->count(); + return Db::name('FinanceReceiptRecord')->alias('frr') + ->where($this->searchWhere) + ->leftJoin('procurement_contract pc','pc.id = frr.contract_id') + ->leftJoin('project p','p.id = pc.project_id')->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceRefundRecordLists.php b/app/adminapi/lists/finance/FinanceRefundRecordLists.php index 9d7e178a4..199a9e52e 100644 --- a/app/adminapi/lists/finance/FinanceRefundRecordLists.php +++ b/app/adminapi/lists/finance/FinanceRefundRecordLists.php @@ -80,7 +80,10 @@ class FinanceRefundRecordLists extends BaseAdminDataLists implements ListsSearch */ public function count(): int { - return FinanceRefundRecord::where($this->searchWhere)->count(); + return Db::name('FinanceRefundRecord')->alias('frr') + ->where($this->searchWhere) + ->leftJoin('procurement_contract pc','pc.id = frr.contract_id') + ->leftJoin('project p','p.id = pc.project_id')->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php index 916406387..563f44927 100644 --- a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php +++ b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php @@ -81,7 +81,12 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc */ public function count(): int { - return FinanceReturnedMoney::where($this->searchWhere)->count(); + return Db::name('FinanceReturnedMoney')->alias('frm') + ->where($this->searchWhere) + ->leftJoin('contract c','c.id = frm.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')->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php index f3b3b720a..4b7346558 100644 --- a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php +++ b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php @@ -78,7 +78,12 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear */ public function count(): int { - return FinanceReturnedRecord::where($this->searchWhere)->count(); + return Db::name('FinanceReturnedRecord')->alias('frr') + ->where($this->searchWhere) + ->leftJoin('contract c','c.id = frr.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')->count(); } } \ No newline at end of file