From 24b93cb6863dbf0891e991abdd5cc41d338815f2 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 14:17:47 +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/bid/BidBuyBiddingDocumentLists.php | 7 ++++++-
app/adminapi/lists/bid/BidSecurityApplyLists.php | 2 ++
app/adminapi/lists/bid/BidSecurityRefundLists.php | 8 +++++++-
app/adminapi/lists/contract/ContractLists.php | 2 ++
app/adminapi/lists/contract/ProcurementContractLists.php | 2 ++
.../lists/contract/SubcontractingContractLists.php | 2 ++
app/adminapi/lists/finance/FinanceInvoiceApplyLists.php | 2 ++
app/adminapi/lists/finance/FinancePaymentPlanLists.php | 2 ++
app/adminapi/lists/finance/FinanceReceiptRecordLists.php | 2 ++
app/adminapi/lists/finance/FinanceRefundRecordLists.php | 2 ++
app/adminapi/lists/finance/FinanceReturnedMoneyLists.php | 2 ++
app/adminapi/lists/finance/FinanceReturnedRecordLists.php | 2 ++
12 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
index 41769af13..ac36f884b 100644
--- a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
+++ b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
@@ -57,6 +57,7 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
{
return Db::name('BidBuyBiddingDocument')->alias('bbbd')
->where($this->searchWhere)
+ ->whereNull('bbbd.delete_time')
->leftJoin('project p','p.id = bbbd.project_id')
->leftJoin('custom ct','ct.id = p.custom_id')
->field('bbbd.*, bbbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name')
@@ -81,7 +82,11 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
*/
public function count(): int
{
- return BidBuyBiddingDocument::where($this->searchWhere)->count();
+ return Db::name('BidBuyBiddingDocument')->alias('bbbd')
+ ->where($this->searchWhere)
+ ->whereNull('bbbd.delete_time')
+ ->leftJoin('project p','p.id = bbbd.project_id')
+ ->leftJoin('custom ct','ct.id = p.custom_id')->count();
}
}
\ No newline at end of file
diff --git a/app/adminapi/lists/bid/BidSecurityApplyLists.php b/app/adminapi/lists/bid/BidSecurityApplyLists.php
index 58849d844..42a67f7b3 100644
--- a/app/adminapi/lists/bid/BidSecurityApplyLists.php
+++ b/app/adminapi/lists/bid/BidSecurityApplyLists.php
@@ -56,6 +56,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt
{
return Db::name('BidSecurityApply')->alias('bsa')
->where($this->searchWhere)
+ ->whereNull('bsa.delete_time')
->leftJoin('bid_bidding_decision bbd','bbd.id = bsa.bidding_decision_id')
->leftJoin('project p','p.id = bbd.project_id')
->leftJoin('custom ct','ct.id = p.custom_id')
@@ -83,6 +84,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt
{
return Db::name('BidSecurityApply')->alias('bsa')
->where($this->searchWhere)
+ ->whereNull('bsa.delete_time')
->leftJoin('bid_bidding_decision bbd','bbd.id = bsa.bidding_decision_id')
->leftJoin('project p','p.id = bbd.project_id')
->leftJoin('custom ct','ct.id = p.custom_id')->count();
diff --git a/app/adminapi/lists/bid/BidSecurityRefundLists.php b/app/adminapi/lists/bid/BidSecurityRefundLists.php
index f54098ac0..902ec4623 100644
--- a/app/adminapi/lists/bid/BidSecurityRefundLists.php
+++ b/app/adminapi/lists/bid/BidSecurityRefundLists.php
@@ -56,6 +56,7 @@ class BidSecurityRefundLists extends BaseAdminDataLists implements ListsSearchIn
{
return Db::name('BidSecurityRefund')->alias('bsr')
->where($this->searchWhere)
+ ->whereNull('bsr.delete_time')
->leftJoin('bid_bidding_decision bbd','bbd.id = bsr.bidding_decision_id')
->leftJoin('project p','p.id = bbd.project_id')
->leftJoin('custom ct','ct.id = p.custom_id')
@@ -81,7 +82,12 @@ class BidSecurityRefundLists extends BaseAdminDataLists implements ListsSearchIn
*/
public function count(): int
{
- return BidSecurityRefund::where($this->searchWhere)->count();
+ return Db::name('BidSecurityRefund')->alias('bsr')
+ ->where($this->searchWhere)
+ ->whereNull('bsr.delete_time')
+ ->leftJoin('bid_bidding_decision bbd','bbd.id = bsr.bidding_decision_id')
+ ->leftJoin('project p','p.id = bbd.project_id')
+ ->leftJoin('custom ct','ct.id = p.custom_id')->count();
}
}
\ No newline at end of file
diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php
index 896f82298..4918f614c 100644
--- a/app/adminapi/lists/contract/ContractLists.php
+++ b/app/adminapi/lists/contract/ContractLists.php
@@ -56,6 +56,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
{
return Db::name('Contract')->alias('c')
->where($this->searchWhere)
+ ->whereNull('c.delete_time')
->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')
@@ -83,6 +84,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
{
return Db::name('Contract')->alias('c')
->where($this->searchWhere)
+ ->whereNull('c.delete_time')
->leftJoin('bid_buy_bidding_document bbbd','c.id = c.buy_bidding_document_id')
->leftJoin('project p','p.id = bbbd.project_id')
->leftJoin('custom ct','ct.id = c.customer_id')->count();
diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php
index 8d5c112db..b1df31a44 100644
--- a/app/adminapi/lists/contract/ProcurementContractLists.php
+++ b/app/adminapi/lists/contract/ProcurementContractLists.php
@@ -65,6 +65,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('ProcurementContract')->alias('pc')
->where($this->searchWhere)->where($this->querySearch())
+ ->whereNull('pc.delete_time')
->leftJoin('project p','p.id = pc.project_id')
->field('pc.*, p.name as project_name, p.project_code')
->limit($this->limitOffset, $this->limitLength)
@@ -97,6 +98,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('ProcurementContract')->alias('pc')
->where($this->searchWhere)->where($this->querySearch())
+ ->whereNull('pc.delete_time')
->leftJoin('project p','p.id = pc.project_id')->count();
}
diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php
index 23888f420..634e5f2f6 100644
--- a/app/adminapi/lists/contract/SubcontractingContractLists.php
+++ b/app/adminapi/lists/contract/SubcontractingContractLists.php
@@ -67,6 +67,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
{
return Db::name('ProcurementContract')->alias('pc')
->where($this->searchWhere)->where($this->querySearch())
+ ->whereNull('pc.delete_time')
->leftJoin('project p','p.id = pc.project_id')
->field('pc.*, p.name as project_name')
->limit($this->limitOffset, $this->limitLength)
@@ -99,6 +100,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
{
return Db::name('ProcurementContract')->alias('pc')
->where($this->searchWhere)->where($this->querySearch())
+ ->whereNull('pc.delete_time')
->leftJoin('project p','p.id = pc.project_id')->count();
}
diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
index f231d9c50..8022daf63 100644
--- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
+++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
@@ -56,6 +56,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinanceInvoiceApply')->alias('fia')
->where($this->searchWhere)
+ ->whereNull('fia.delete_time')
->leftJoin('contract c','c.id = fia.contract_id')
->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
->leftJoin('project p','p.id = bbbd.project_id')
@@ -84,6 +85,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinanceInvoiceApply')->alias('fia')
->where($this->searchWhere)
+ ->whereNull('fia.delete_time')
->leftJoin('contract c','c.id = fia.contract_id')
->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
->leftJoin('project p','p.id = bbbd.project_id')
diff --git a/app/adminapi/lists/finance/FinancePaymentPlanLists.php b/app/adminapi/lists/finance/FinancePaymentPlanLists.php
index acb7109e7..ca854001c 100644
--- a/app/adminapi/lists/finance/FinancePaymentPlanLists.php
+++ b/app/adminapi/lists/finance/FinancePaymentPlanLists.php
@@ -56,6 +56,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
{
return Db::name('FinancePaymentPlan')->alias('fpp')
->where($this->searchWhere)
+ ->whereNull('fpp.delete_time')
->leftJoin('procurement_contract pc','pc.id = fpp.contract_id')
->leftJoin('project p','p.id = pc.project_id')
->field('fpp.*, p.id as project_id, p.name as project_name, p.project_code, pc.contract_no')
@@ -81,6 +82,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
{
return Db::name('FinancePaymentPlan')->alias('fpp')
->where($this->searchWhere)
+ ->whereNull('fpp.delete_time')
->leftJoin('procurement_contract pc','pc.id = fpp.contract_id')
->leftJoin('project p','p.id = pc.project_id')->count();
}
diff --git a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
index bee83312f..8006cb424 100644
--- a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
@@ -57,6 +57,7 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc
{
return Db::name('FinanceReceiptRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->leftJoin('procurement_contract pc','pc.id = frr.contract_id')
->leftJoin('project p','p.id = pc.project_id')
->field('frr.*, p.id as project_id, p.name as project_name, p.project_code, pc.contract_no')
@@ -82,6 +83,7 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc
{
return Db::name('FinanceReceiptRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->leftJoin('procurement_contract pc','pc.id = frr.contract_id')
->leftJoin('project p','p.id = pc.project_id')->count();
}
diff --git a/app/adminapi/lists/finance/FinanceRefundRecordLists.php b/app/adminapi/lists/finance/FinanceRefundRecordLists.php
index 199a9e52e..5cdd9cd49 100644
--- a/app/adminapi/lists/finance/FinanceRefundRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceRefundRecordLists.php
@@ -56,6 +56,7 @@ class FinanceRefundRecordLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinanceRefundRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->leftJoin('procurement_contract pc','pc.id = frr.contract_id')
->leftJoin('project p','p.id = pc.project_id')
->field('frr.*, p.id as project_id, p.name as project_name, p.project_code, pc.contract_no')
@@ -82,6 +83,7 @@ class FinanceRefundRecordLists extends BaseAdminDataLists implements ListsSearch
{
return Db::name('FinanceRefundRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->leftJoin('procurement_contract pc','pc.id = frr.contract_id')
->leftJoin('project p','p.id = pc.project_id')->count();
}
diff --git a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
index 563f44927..0724ffd55 100644
--- a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
@@ -59,6 +59,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
{
return Db::name('FinanceReturnedMoney')->alias('frm')
->where($this->searchWhere)
+ ->whereNull('frm.delete_time')
->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')
@@ -83,6 +84,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
{
return Db::name('FinanceReturnedMoney')->alias('frm')
->where($this->searchWhere)
+ ->whereNull('frm.delete_time')
->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')
diff --git a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
index 4b7346558..819d9815b 100644
--- a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
@@ -56,6 +56,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
{
return Db::name('FinanceReturnedRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->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')
@@ -80,6 +81,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
{
return Db::name('FinanceReturnedRecord')->alias('frr')
->where($this->searchWhere)
+ ->whereNull('frr.delete_time')
->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')