From ffd8c8a73ba938d1510e25e6d77ff47e24c4fa70 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 14 Dec 2023 10:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=9E=E6=AC=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/bid/BidBiddingDecisionLogic.php           | 2 +-
 app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php        | 2 +-
 app/adminapi/logic/bid/BidResultLogic.php                    | 4 ++--
 app/adminapi/logic/contract/ContractLogic.php                | 4 ++--
 app/adminapi/logic/contract/ContractNegotiationLogic.php     | 2 +-
 .../logic/contract/ProcurementContractChangeLogic.php        | 4 ++--
 app/adminapi/logic/contract/ProcurementContractLogic.php     | 4 ++--
 app/adminapi/logic/contract/SubcontractingContractLogic.php  | 5 +++--
 .../contract/SubcontractingContractNegotiationLogic.php      | 2 +-
 app/adminapi/logic/custom_follow/CustomFollowLogic.php       | 2 +-
 app/adminapi/logic/custom_service/CustomServiceLogic.php     | 4 ++--
 app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php      | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php     | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedRecordLogic.php    | 5 +++--
 app/adminapi/logic/quotation/QuotationLogic.php              | 4 ++--
 15 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
index 8a47cbe20..98db1aa8f 100644
--- a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
+++ b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
@@ -139,7 +139,7 @@ class BidBiddingDecisionLogic extends BaseLogic
         if (!empty($bidBiddingDecision->project->custom_id)) {
             $bidBiddingDecision->custom = Custom::findOrEmpty($bidBiddingDecision->project->custom_id);
         }
-        $bidBiddingDecision->project = $bidBiddingDecision->project;
+        $bidBiddingDecision->project;
         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 e4a1f8d98..a89df663d 100644
--- a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
+++ b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php
@@ -138,7 +138,7 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
         if (!empty($bidBuyBiddingDocument->project->custom_id)) {
             $bidBuyBiddingDocument->custom = Custom::findOrEmpty($bidBuyBiddingDocument->project->custom_id);
         }
-        $bidBuyBiddingDocument->project = $bidBuyBiddingDocument->project;
+        $bidBuyBiddingDocument->project;
         return $bidBuyBiddingDocument->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/bid/BidResultLogic.php b/app/adminapi/logic/bid/BidResultLogic.php
index 77a8aa5d9..bcc6ff616 100644
--- a/app/adminapi/logic/bid/BidResultLogic.php
+++ b/app/adminapi/logic/bid/BidResultLogic.php
@@ -121,8 +121,8 @@ class BidResultLogic extends BaseLogic
         if (!empty($bidResult->project->custom_id)) {
             $bidResult->custom = Custom::findOrEmpty($bidResult->project->custom_id);
         }
-        $bidResult->project = $bidResult->project;
-        $bidResult->examination = $bidResult->examination;
+        $bidResult->project;
+        $bidResult->examination;
         return $bidResult->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php
index 4af140c59..874319c86 100644
--- a/app/adminapi/logic/contract/ContractLogic.php
+++ b/app/adminapi/logic/contract/ContractLogic.php
@@ -156,8 +156,8 @@ class ContractLogic extends BaseLogic
     public static function detail($params): array
     {
         $contract = Contract::findOrEmpty($params['id']);
-        $contract->custom = $contract->custom;
-        $contract->document = $contract->document;
+        $contract->custom;
+        $contract->document;
         return $contract->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/contract/ContractNegotiationLogic.php b/app/adminapi/logic/contract/ContractNegotiationLogic.php
index 049e7a92c..d316a7af0 100644
--- a/app/adminapi/logic/contract/ContractNegotiationLogic.php
+++ b/app/adminapi/logic/contract/ContractNegotiationLogic.php
@@ -132,7 +132,7 @@ class ContractNegotiationLogic extends BaseLogic
     public static function detail($params): array
     {
         $contractNegotiation = ContractNegotiation::findOrEmpty($params['id']);
-        $contractNegotiation->contract = $contractNegotiation->contract;
+        $contractNegotiation->contract;
         return $contractNegotiation->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/contract/ProcurementContractChangeLogic.php b/app/adminapi/logic/contract/ProcurementContractChangeLogic.php
index 5ff20f67c..4b748d51f 100644
--- a/app/adminapi/logic/contract/ProcurementContractChangeLogic.php
+++ b/app/adminapi/logic/contract/ProcurementContractChangeLogic.php
@@ -164,8 +164,8 @@ class ProcurementContractChangeLogic extends BaseLogic
         if (!empty($procurementContractChange->project->custom_id)) {
             $procurementContractChange->custom = Custom::findOrEmpty($procurementContractChange->project->custom_id);
         }
-        $procurementContractChange->project = $procurementContractChange->project;
-        $procurementContractChange->material = $procurementContractChange->material;
+        $procurementContractChange->project;
+        $procurementContractChange->material;
         return $procurementContractChange->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php
index 7dd823695..13a37c1d1 100644
--- a/app/adminapi/logic/contract/ProcurementContractLogic.php
+++ b/app/adminapi/logic/contract/ProcurementContractLogic.php
@@ -163,8 +163,8 @@ class ProcurementContractLogic extends BaseLogic
         if (!empty($procurementContract->project->custom_id)) {
             $procurementContract->custom = Custom::findOrEmpty($procurementContract->project->custom_id);
         }
-        $procurementContract->project = $procurementContract->project;
-        $procurementContract->material = $procurementContract->material;
+        $procurementContract->project;
+        $procurementContract->material;
         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 9de3fafbf..2ab0ef0d1 100644
--- a/app/adminapi/logic/contract/SubcontractingContractLogic.php
+++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php
@@ -166,8 +166,9 @@ class SubcontractingContractLogic extends BaseLogic
         if (!empty($subcontractingContract->project->custom_id)) {
             $subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id);
         }
-        $subcontractingContract->project = $subcontractingContract->project;
-        $subcontractingContract->work = $subcontractingContract->work;
+        $subcontractingContract->pay_plan = json_decode($subcontractingContract->pay_plan, true);
+        $subcontractingContract->project;
+        $subcontractingContract->work;
         return $subcontractingContract->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
index 5b3bce293..7fb8531ca 100644
--- a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
+++ b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
@@ -122,7 +122,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
     public static function detail($params): array
     {
         $subcontractingContractNegotiation = SubcontractingContractNegotiation::findOrEmpty($params['id']);
-        $subcontractingContractNegotiation->contract = $subcontractingContractNegotiation->contract;
+        $subcontractingContractNegotiation->contract;
         return $subcontractingContractNegotiation->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 225e50947..700530460 100644
--- a/app/adminapi/logic/custom_follow/CustomFollowLogic.php
+++ b/app/adminapi/logic/custom_follow/CustomFollowLogic.php
@@ -120,7 +120,7 @@ class CustomFollowLogic extends BaseLogic
     public static function detail($params): array
     {
         $customFollow = CustomFollow::findOrEmpty($params['id']);
-        $customFollow->custom = $customFollow->custom;
+        $customFollow->custom;
         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 5eb4f40e4..b18593e16 100644
--- a/app/adminapi/logic/custom_service/CustomServiceLogic.php
+++ b/app/adminapi/logic/custom_service/CustomServiceLogic.php
@@ -128,8 +128,8 @@ class CustomServiceLogic extends BaseLogic
     public static function detail($params): array
     {
         $customService = CustomService::findOrEmpty($params['id']);
-        $customService->project = $customService->project;
-        $customService->custom = $customService->custom;
+        $customService->project;
+        $customService->custom;
         return $customService->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
index b0a4a41ca..07c7d8ee5 100644
--- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
@@ -156,8 +156,8 @@ class FinanceInvoiceApplyLogic extends BaseLogic
     public static function detail($params): array
     {
         $financeInvoiceApply = FinanceInvoiceApply::findOrEmpty($params['id']);
-        $financeInvoiceApply->contract = $financeInvoiceApply->contract;
-        $financeInvoiceApply->custom = $financeInvoiceApply->custom;
+        $financeInvoiceApply->contract;
+        $financeInvoiceApply->custom;
         return $financeInvoiceApply->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
index c58f56345..d573cf37d 100644
--- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
@@ -118,8 +118,8 @@ class FinanceReturnedMoneyLogic extends BaseLogic
     public static function detail($params): array
     {
         $financeReturnedMoney = FinanceReturnedMoney::findOrEmpty($params['id']);
-        $financeReturnedMoney->contract = $financeReturnedMoney->contract;
-        $financeReturnedMoney->custom = $financeReturnedMoney->custom;
+        $financeReturnedMoney->contract;
+        $financeReturnedMoney->custom;
         return $financeReturnedMoney->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
index c641063dd..25e671b17 100644
--- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
@@ -134,9 +134,10 @@ class FinanceReturnedRecordLogic extends BaseLogic
     public static function detail($params): array
     {
         $financeReturnedRecord = FinanceReturnedRecord::findOrEmpty($params['id']);
-        $financeReturnedRecord->contract = $financeReturnedRecord->contract;
-        $financeReturnedRecord->custom = $financeReturnedRecord->custom;
+        $financeReturnedRecord->contract;
+        $financeReturnedRecord->custom;
         $financeReturnedRecord->plan = $financeReturnedRecord->returnedPlan;
+        unset($financeReturnedRecord->returnedPlan);
         return $financeReturnedRecord->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/quotation/QuotationLogic.php b/app/adminapi/logic/quotation/QuotationLogic.php
index d678c05a1..2ef49fc0f 100644
--- a/app/adminapi/logic/quotation/QuotationLogic.php
+++ b/app/adminapi/logic/quotation/QuotationLogic.php
@@ -149,8 +149,8 @@ class QuotationLogic extends BaseLogic
     public static function detail($params): array
     {
         $quotation = Quotation::findOrEmpty($params['id']);
-        $quotation->product = $quotation->product;
-        $quotation->custom = $quotation->custom;
+        $quotation->product;
+        $quotation->custom;
         return $quotation->toArray();
     }
 }
\ No newline at end of file