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:17:47 +08:00
parent 63aed90d9a
commit 24b93cb686
12 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
View File

@ -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();
}
}

2
app/adminapi/lists/bid/BidSecurityApplyLists.php
View File

@ -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();

8
app/adminapi/lists/bid/BidSecurityRefundLists.php
View File

@ -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();
}
}

2
app/adminapi/lists/contract/ContractLists.php
View File

@ -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();

2
app/adminapi/lists/contract/ProcurementContractLists.php
View File

@ -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();
}

2
app/adminapi/lists/contract/SubcontractingContractLists.php
View File

@ -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();
}

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

@ -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')

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

@ -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();
}

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

@ -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();
}

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

@ -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();
}

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

@ -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')

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

@ -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')