From c5bbf1d0107892f2a254d504f74918850d56512f Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Fri, 22 Dec 2023 16:22:10 +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 --- .../logic/administrative/AdministrativePaymentsLogic.php | 1 + .../administrative/AdministrativeTicketCollectionLogic.php | 1 + app/adminapi/logic/bid/BidBiddingDecisionLogic.php | 1 + app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php | 1 + app/adminapi/logic/bid/BidDocumentExaminationLogic.php | 1 + app/adminapi/logic/bid/BidResultLogic.php | 1 + app/adminapi/logic/bid/BidSecurityApplyLogic.php | 1 + app/adminapi/logic/bid/BidSecurityRefundLogic.php | 1 + app/adminapi/logic/bill/AcceptanceBillLogic.php | 1 + app/adminapi/logic/bill/RedemptionBillLogic.php | 1 + app/adminapi/logic/bill/TransferBillLogic.php | 1 + app/adminapi/logic/contract/AdministrativeContractLogic.php | 1 + app/adminapi/logic/contract/ContractLogic.php | 1 + app/adminapi/logic/contract/ProcurementContractLogic.php | 1 + app/adminapi/logic/contract/SubcontractingContractLogic.php | 1 + app/adminapi/logic/custom/CustomContactsLogic.php | 1 + app/adminapi/logic/custom_follow/CustomFollowLogic.php | 1 + app/adminapi/logic/custom_service/CustomServiceLogic.php | 3 ++- app/adminapi/logic/expense/ExpenseReimbursementLogic.php | 1 + app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php | 1 + app/adminapi/logic/finance/FinancePaymentApplyLogic.php | 1 + app/adminapi/logic/finance/FinancePaymentPlanLogic.php | 1 + app/adminapi/logic/finance/FinanceReceiptRecordLogic.php | 1 + app/adminapi/logic/finance/FinanceRefundApplyLogic.php | 1 + app/adminapi/logic/finance/FinanceRefundRecordLogic.php | 1 + app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php | 1 + app/adminapi/logic/quotation/QuotationLogic.php | 1 + 27 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php b/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php index ed7a0523c..4d46e5d15 100644 --- a/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php +++ b/app/adminapi/logic/administrative/AdministrativePaymentsLogic.php @@ -131,6 +131,7 @@ class AdministrativePaymentsLogic extends BaseLogic $administrativePayments->contract; $administrativePayments->org; $administrativePayments->dept; + $administrativePayments->annex = json_decode($administrativePayments->annex, true); return $administrativePayments->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php b/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php index 6b20f5a48..c5e0b6dee 100644 --- a/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php +++ b/app/adminapi/logic/administrative/AdministrativeTicketCollectionLogic.php @@ -131,6 +131,7 @@ class AdministrativeTicketCollectionLogic extends BaseLogic $administrativeTicketCollection->contract; $administrativeTicketCollection->org; $administrativeTicketCollection->dept; + $administrativeTicketCollection->annex = json_decode($administrativeTicketCollection->annex, true); return $administrativeTicketCollection->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php index 98db1aa8f..e262ac619 100644 --- a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php +++ b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php @@ -140,6 +140,7 @@ class BidBiddingDecisionLogic extends BaseLogic $bidBiddingDecision->custom = Custom::findOrEmpty($bidBiddingDecision->project->custom_id); } $bidBiddingDecision->project; + $bidBiddingDecision->annex = json_decode($bidBiddingDecision->annex, true); return $bidBiddingDecision->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php index 7e09b9b38..688231459 100644 --- a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php +++ b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php @@ -139,6 +139,7 @@ class BidBuyBiddingDocumentLogic extends BaseLogic if (!empty($bidBuyBiddingDocument->project->custom_id)) { $bidBuyBiddingDocument->custom = Custom::findOrEmpty($bidBuyBiddingDocument->project->custom_id); } + $bidBuyBiddingDocument->annex = json_decode($bidBuyBiddingDocument->annex, true); return $bidBuyBiddingDocument->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php index 3fb4f311a..c2459fe51 100644 --- a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php +++ b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php @@ -164,6 +164,7 @@ class BidDocumentExaminationLogic extends BaseLogic { $bidDocumentExamination = BidDocumentExamination::findOrEmpty($params['id']); $bidDocumentExamination->document = $bidDocumentExamination->document; + $bidDocumentExamination->annex = json_decode($bidDocumentExamination->annex, true); return $bidDocumentExamination->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidResultLogic.php b/app/adminapi/logic/bid/BidResultLogic.php index bcc6ff616..a097bc70a 100644 --- a/app/adminapi/logic/bid/BidResultLogic.php +++ b/app/adminapi/logic/bid/BidResultLogic.php @@ -123,6 +123,7 @@ class BidResultLogic extends BaseLogic } $bidResult->project; $bidResult->examination; + $bidResult->annex = json_decode($bidResult->annex, true); return $bidResult->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidSecurityApplyLogic.php b/app/adminapi/logic/bid/BidSecurityApplyLogic.php index 379af5767..e44f07742 100644 --- a/app/adminapi/logic/bid/BidSecurityApplyLogic.php +++ b/app/adminapi/logic/bid/BidSecurityApplyLogic.php @@ -130,6 +130,7 @@ class BidSecurityApplyLogic extends BaseLogic if (!empty($bidSecurityApply->project->custom_id)) { $bidSecurityApply->custom = Custom::findOrEmpty($bidSecurityApply->project->custom_id); } + $bidSecurityApply->annex = json_decode($bidSecurityApply->annex, true); return $bidSecurityApply->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bid/BidSecurityRefundLogic.php b/app/adminapi/logic/bid/BidSecurityRefundLogic.php index 6972b298e..dbdfa899c 100644 --- a/app/adminapi/logic/bid/BidSecurityRefundLogic.php +++ b/app/adminapi/logic/bid/BidSecurityRefundLogic.php @@ -128,6 +128,7 @@ class BidSecurityRefundLogic extends BaseLogic if (!empty($bidSecurityRefund->project->custom_id)) { $bidSecurityRefund->custom = Custom::findOrEmpty($bidSecurityRefund->project->custom_id); } + $bidSecurityRefund->annex = json_decode($bidSecurityRefund->annex, true); return $bidSecurityRefund->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bill/AcceptanceBillLogic.php b/app/adminapi/logic/bill/AcceptanceBillLogic.php index 52d11f5de..e87be8350 100644 --- a/app/adminapi/logic/bill/AcceptanceBillLogic.php +++ b/app/adminapi/logic/bill/AcceptanceBillLogic.php @@ -135,6 +135,7 @@ class AcceptanceBillLogic extends BaseLogic $acceptanceBill->org; $acceptanceBill->dept; $acceptanceBill->contract; + $acceptanceBill->annex = json_decode($acceptanceBill->annex, true); return $acceptanceBill->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bill/RedemptionBillLogic.php b/app/adminapi/logic/bill/RedemptionBillLogic.php index fd77f4b34..98a147f6e 100644 --- a/app/adminapi/logic/bill/RedemptionBillLogic.php +++ b/app/adminapi/logic/bill/RedemptionBillLogic.php @@ -119,6 +119,7 @@ class RedemptionBillLogic extends BaseLogic $redemptionBill->org; $redemptionBill->dept; $redemptionBill->acceptance; + $redemptionBill->annex = json_decode($redemptionBill->annex, true); return $redemptionBill->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/bill/TransferBillLogic.php b/app/adminapi/logic/bill/TransferBillLogic.php index 718d2e326..f2b3f3c4b 100644 --- a/app/adminapi/logic/bill/TransferBillLogic.php +++ b/app/adminapi/logic/bill/TransferBillLogic.php @@ -127,6 +127,7 @@ class TransferBillLogic extends BaseLogic $transferBill->project = $transferBill->contract->project; $transferBill->custom = $transferBill->project->custom; unset($transferBill->contract->project, $transferBill->project->custom); + $transferBill->annex = json_decode($transferBill->annex, true); return $transferBill->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/AdministrativeContractLogic.php b/app/adminapi/logic/contract/AdministrativeContractLogic.php index ca89f935e..e59e33412 100644 --- a/app/adminapi/logic/contract/AdministrativeContractLogic.php +++ b/app/adminapi/logic/contract/AdministrativeContractLogic.php @@ -134,6 +134,7 @@ class AdministrativeContractLogic extends BaseLogic $administrativeContract = AdministrativeContract::findOrEmpty($params['id']); $administrativeContract->org; $administrativeContract->dept; + $administrativeContract->annex = json_decode($administrativeContract->annex, true); return $administrativeContract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php index 47c10eb20..cbb543687 100644 --- a/app/adminapi/logic/contract/ContractLogic.php +++ b/app/adminapi/logic/contract/ContractLogic.php @@ -173,6 +173,7 @@ class ContractLogic extends BaseLogic } $contract->org; $contract->dept; + $contract->annex = json_decode($contract->annex, true); return $contract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php index 19334dabf..52094db29 100644 --- a/app/adminapi/logic/contract/ProcurementContractLogic.php +++ b/app/adminapi/logic/contract/ProcurementContractLogic.php @@ -177,6 +177,7 @@ class ProcurementContractLogic extends BaseLogic $procurementContract->material; $procurementContract->org; $procurementContract->dept; + $procurementContract->annex = json_decode($procurementContract->annex, true); return $procurementContract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php index fd9c9fdcb..1281374f8 100644 --- a/app/adminapi/logic/contract/SubcontractingContractLogic.php +++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php @@ -180,6 +180,7 @@ class SubcontractingContractLogic extends BaseLogic $subcontractingContract->work; $subcontractingContract->org; $subcontractingContract->dept; + $subcontractingContract->annex = json_decode($subcontractingContract->annex, true); return $subcontractingContract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/custom/CustomContactsLogic.php b/app/adminapi/logic/custom/CustomContactsLogic.php index 1734c2de4..cf9841a9f 100644 --- a/app/adminapi/logic/custom/CustomContactsLogic.php +++ b/app/adminapi/logic/custom/CustomContactsLogic.php @@ -117,6 +117,7 @@ class CustomContactsLogic extends BaseLogic { $customContacts = CustomContacts::findOrEmpty($params['id']); $customContacts->custom = $customContacts->custom; + $customContacts->annex = json_decode($customContacts->annex, true); return $customContacts->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/custom_follow/CustomFollowLogic.php b/app/adminapi/logic/custom_follow/CustomFollowLogic.php index 700530460..c5d721620 100644 --- a/app/adminapi/logic/custom_follow/CustomFollowLogic.php +++ b/app/adminapi/logic/custom_follow/CustomFollowLogic.php @@ -121,6 +121,7 @@ class CustomFollowLogic extends BaseLogic { $customFollow = CustomFollow::findOrEmpty($params['id']); $customFollow->custom; + $customFollow->annex = json_decode($customFollow->annex, true); return $customFollow->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/custom_service/CustomServiceLogic.php b/app/adminapi/logic/custom_service/CustomServiceLogic.php index b18593e16..248957960 100644 --- a/app/adminapi/logic/custom_service/CustomServiceLogic.php +++ b/app/adminapi/logic/custom_service/CustomServiceLogic.php @@ -129,7 +129,8 @@ class CustomServiceLogic extends BaseLogic { $customService = CustomService::findOrEmpty($params['id']); $customService->project; - $customService->custom; + $customService->custom; + $customService->annex = json_decode($customService->annex, true); return $customService->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php index 7c9b3309c..b8bf9e604 100644 --- a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php +++ b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php @@ -188,6 +188,7 @@ class ExpenseReimbursementLogic extends BaseLogic $expenseReimbursement->custom; $expenseReimbursement->org; $expenseReimbursement->dept; + $expenseReimbursement->annex = json_decode($expenseReimbursement->annex, true); return $expenseReimbursement->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php index e806a1491..2fc3a8f95 100644 --- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php +++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php @@ -168,6 +168,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic if (!empty($financeInvoiceApply->document->project_id)) { $financeInvoiceApply->project = Project::findOrEmpty($financeInvoiceApply->document->project_id); } + $financeInvoiceApply->annex = json_decode($financeInvoiceApply->annex, true); return $financeInvoiceApply->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php index 17fc55850..4a5040e5a 100644 --- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php +++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php @@ -145,6 +145,7 @@ class FinancePaymentApplyLogic extends BaseLogic if (!empty($financePaymentApply->contract->project_id)) { $financePaymentApply->project = Project::findOrEmpty($financePaymentApply->contract->project_id); } + $financePaymentApply->annex = json_decode($financePaymentApply->annex, true); return $financePaymentApply->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php index 0be71adf1..a59c7058e 100644 --- a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php +++ b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php @@ -126,6 +126,7 @@ class FinancePaymentPlanLogic extends BaseLogic if (!empty($financePaymentPlan->contract->project_id)) { $financePaymentPlan->project = Project::findOrEmpty($financePaymentPlan->contract->project_id); } + $financePaymentPlan->annex = json_decode($financePaymentPlan->annex, true); return $financePaymentPlan->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php index e6caa176b..a51ed2b9e 100644 --- a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php @@ -134,6 +134,7 @@ class FinanceReceiptRecordLogic extends BaseLogic if (!empty($financeReceiptRecord->contract->project_id)) { $financeReceiptRecord->project = Project::findOrEmpty($financeReceiptRecord->contract->project_id); } + $financeReceiptRecord->annex = json_decode($financeReceiptRecord->annex, true); return $financeReceiptRecord->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php index 932a2c78e..264d152c4 100644 --- a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php +++ b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php @@ -131,6 +131,7 @@ class FinanceRefundApplyLogic extends BaseLogic $financeRefundApply->document = $financeRefundApply->contract->document; $financeRefundApply->project = $financeRefundApply->document->project; unset($financeRefundApply->contract->document, $financeRefundApply->document->project); + $financeRefundApply->annex = json_decode($financeRefundApply->annex, true); return $financeRefundApply->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php index 1cba22c16..626ec7153 100644 --- a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php @@ -131,6 +131,7 @@ class FinanceRefundRecordLogic extends BaseLogic if (!empty($financeRefundRecord->contract->project_id)) { $financeRefundRecord->project = Project::findOrEmpty($financeRefundRecord->contract->project_id); } + $financeRefundRecord->annex = json_decode($financeRefundRecord->annex, true); return $financeRefundRecord->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php index eb7a2dc1e..60617c4fd 100644 --- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php @@ -125,6 +125,7 @@ class FinanceReturnedMoneyLogic extends BaseLogic $financeReturnedMoney->document = $financeReturnedMoney->contract->document; $financeReturnedMoney->project = $financeReturnedMoney->document->project; unset($financeReturnedMoney->contract->document, $financeReturnedMoney->document->project); + $financeReturnedMoney->annex = json_decode($financeReturnedMoney->annex, true); return $financeReturnedMoney->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/quotation/QuotationLogic.php b/app/adminapi/logic/quotation/QuotationLogic.php index 2ef49fc0f..698995164 100644 --- a/app/adminapi/logic/quotation/QuotationLogic.php +++ b/app/adminapi/logic/quotation/QuotationLogic.php @@ -151,6 +151,7 @@ class QuotationLogic extends BaseLogic $quotation = Quotation::findOrEmpty($params['id']); $quotation->product; $quotation->custom; + $quotation->annex = json_decode($quotation->annex, true); return $quotation->toArray(); } } \ No newline at end of file