mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-20 17:05:59 +08:00
parent 8d37d47a9f
commit 92f72e227c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/logic/bid/BidDocumentExaminationLogic.php
View File

@ -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'];

4
app/common/model/bid/BidDocumentExamination.php
View File

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