From 92f72e227ce97e64229726344779e15552651b60 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Wed, 20 Mar 2024 17:05:59 +0800 Subject: [PATCH] update --- app/adminapi/logic/bid/BidDocumentExaminationLogic.php | 1 - app/common/model/bid/BidDocumentExamination.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php index affa0a76d..a19158267 100644 --- a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php +++ b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php @@ -196,7 +196,6 @@ class BidDocumentExaminationLogic extends BaseLogic $data['margin_amount_return_date'] = $bid_decision['margin_amount_return_date']; $data['bid_project_overview'] = $bid_decision['bid_project_overview']; $data['project_desc'] = $bid_decision['project_desc']; - $data['annex'] = $bid_decision['annex']; $data['total_amount'] = BidDocumentExaminationDetail::where('bid_document_examination_id',$data['id'])->sum('sale_amount'); $approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); $data['approve_check_status'] = $approve_data['check_status']; diff --git a/app/common/model/bid/BidDocumentExamination.php b/app/common/model/bid/BidDocumentExamination.php index a138542c6..c290b1ac1 100644 --- a/app/common/model/bid/BidDocumentExamination.php +++ b/app/common/model/bid/BidDocumentExamination.php @@ -32,11 +32,11 @@ class BidDocumentExamination extends BaseModel protected $deleteTime = 'delete_time'; public function getTechnicalReviewAnnexAttr($value){ - return !empty($value) ? json_decode($value) : ''; + return !empty($value) ? json_decode($value,true) : ''; } public function getBusinessContractDeviationAnnexAttr($value){ - return !empty($value) ? json_decode($value) : ''; + return !empty($value) ? json_decode($value,true) : ''; } public function getTaxRateTextAttr($value,$data){