From 9c702abc84a37cc94e23176024f6a691ee57d9a3 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Wed, 13 Dec 2023 17:51:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/logic/bid/BidBiddingDecisionLogic.php | 5 +++++ app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php | 5 +++++ app/adminapi/logic/bid/BidResultLogic.php | 5 +++++ .../logic/contract/ProcurementContractChangeLogic.php | 5 +++++ app/adminapi/logic/contract/ProcurementContractLogic.php | 5 +++++ app/adminapi/logic/contract/SubcontractingContractLogic.php | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php index d0d73d427..8a47cbe20 100644 --- a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php +++ b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php @@ -16,6 +16,7 @@ namespace app\adminapi\logic\bid; use app\common\model\bid\BidBiddingDecision; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -134,6 +135,10 @@ class BidBiddingDecisionLogic extends BaseLogic public static function detail($params): array { $bidBiddingDecision = BidBiddingDecision::findOrEmpty($params['id']); + $bidBiddingDecision->custom = null; + if (!empty($bidBiddingDecision->project->custom_id)) { + $bidBiddingDecision->custom = Custom::findOrEmpty($bidBiddingDecision->project->custom_id); + } $bidBiddingDecision->project = $bidBiddingDecision->project; return $bidBiddingDecision->toArray(); } diff --git a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php index 530f16d88..e4a1f8d98 100644 --- a/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php +++ b/app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php @@ -16,6 +16,7 @@ namespace app\adminapi\logic\bid; use app\common\model\bid\BidBuyBiddingDocument; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -133,6 +134,10 @@ class BidBuyBiddingDocumentLogic extends BaseLogic public static function detail($params): array { $bidBuyBiddingDocument = BidBuyBiddingDocument::findOrEmpty($params['id']); + $bidBuyBiddingDocument->custom = null; + if (!empty($bidBuyBiddingDocument->project->custom_id)) { + $bidBuyBiddingDocument->custom = Custom::findOrEmpty($bidBuyBiddingDocument->project->custom_id); + } $bidBuyBiddingDocument->project = $bidBuyBiddingDocument->project; return $bidBuyBiddingDocument->toArray(); } diff --git a/app/adminapi/logic/bid/BidResultLogic.php b/app/adminapi/logic/bid/BidResultLogic.php index 1d8097ed2..77a8aa5d9 100644 --- a/app/adminapi/logic/bid/BidResultLogic.php +++ b/app/adminapi/logic/bid/BidResultLogic.php @@ -16,6 +16,7 @@ namespace app\adminapi\logic\bid; use app\common\model\bid\BidResult; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -116,6 +117,10 @@ class BidResultLogic extends BaseLogic public static function detail($params): array { $bidResult = BidResult::findOrEmpty($params['id']); + $bidResult->custom = null; + if (!empty($bidResult->project->custom_id)) { + $bidResult->custom = Custom::findOrEmpty($bidResult->project->custom_id); + } $bidResult->project = $bidResult->project; $bidResult->examination = $bidResult->examination; return $bidResult->toArray(); diff --git a/app/adminapi/logic/contract/ProcurementContractChangeLogic.php b/app/adminapi/logic/contract/ProcurementContractChangeLogic.php index 62f84d3b8..5ff20f67c 100644 --- a/app/adminapi/logic/contract/ProcurementContractChangeLogic.php +++ b/app/adminapi/logic/contract/ProcurementContractChangeLogic.php @@ -17,6 +17,7 @@ namespace app\adminapi\logic\contract; use app\common\model\contract\ProcurementContractChange; use app\common\model\contract\ProcurementContractDetail; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -159,6 +160,10 @@ class ProcurementContractChangeLogic extends BaseLogic public static function detail($params): array { $procurementContractChange = ProcurementContractChange::findOrEmpty($params['id']); + $procurementContractChange->custom = null; + if (!empty($procurementContractChange->project->custom_id)) { + $procurementContractChange->custom = Custom::findOrEmpty($procurementContractChange->project->custom_id); + } $procurementContractChange->project = $procurementContractChange->project; $procurementContractChange->material = $procurementContractChange->material; return $procurementContractChange->toArray(); diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php index b420fc64a..7dd823695 100644 --- a/app/adminapi/logic/contract/ProcurementContractLogic.php +++ b/app/adminapi/logic/contract/ProcurementContractLogic.php @@ -17,6 +17,7 @@ namespace app\adminapi\logic\contract; use app\common\model\contract\ProcurementContract; use app\common\model\contract\ProcurementContractDetail; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -158,6 +159,10 @@ class ProcurementContractLogic extends BaseLogic public static function detail($params): array { $procurementContract = ProcurementContract::findOrEmpty($params['id']); + $procurementContract->custom = null; + if (!empty($procurementContract->project->custom_id)) { + $procurementContract->custom = Custom::findOrEmpty($procurementContract->project->custom_id); + } $procurementContract->project = $procurementContract->project; $procurementContract->material = $procurementContract->material; return $procurementContract->toArray(); diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php index 3c011afe7..9de3fafbf 100644 --- a/app/adminapi/logic/contract/SubcontractingContractLogic.php +++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php @@ -17,6 +17,7 @@ namespace app\adminapi\logic\contract; use app\common\model\contract\SubcontractingContract; use app\common\model\contract\SubcontractingContractDetail; +use app\common\model\custom\Custom; use app\common\logic\BaseLogic; use think\facade\Db; @@ -161,6 +162,10 @@ class SubcontractingContractLogic extends BaseLogic public static function detail($params): array { $subcontractingContract = SubcontractingContract::findOrEmpty($params['id']); + $subcontractingContract->custom = null; + if (!empty($subcontractingContract->project->custom_id)) { + $subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id); + } $subcontractingContract->project = $subcontractingContract->project; $subcontractingContract->work = $subcontractingContract->work; return $subcontractingContract->toArray();