From 9cbed7e8e3decd02ede2a5853e4307c492471b44 Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 6 Jan 2024 16:51:04 +0800 Subject: [PATCH] fixed --- .../logic/bid/BidDocumentExaminationLogic.php | 2 +- .../contract/ContractNegotiationValidate.php | 31 +++++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php index 2063f3475..0b6ed1727 100644 --- a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php +++ b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php @@ -132,7 +132,7 @@ class BidDocumentExaminationLogic extends BaseLogic $data['bid_project_overview'] = $bid_decision['bid_project_overview']; $data['project_desc'] = $bid_decision['project_desc']; $data['annex'] = $bid_decision['annex']; - $item['total_amount'] = BidDocumentExaminationDetail::where('bid_document_examination_id',$data['id'])->sum('sale_amount'); + $data['total_amount'] = BidDocumentExaminationDetail::where('bid_document_examination_id',$data['id'])->sum('sale_amount'); return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/validate/contract/ContractNegotiationValidate.php b/app/adminapi/validate/contract/ContractNegotiationValidate.php index 1846a20f7..9559d4524 100644 --- a/app/adminapi/validate/contract/ContractNegotiationValidate.php +++ b/app/adminapi/validate/contract/ContractNegotiationValidate.php @@ -32,19 +32,30 @@ class ContractNegotiationValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', - 'contract_id' => 'require', - 'approve_id' => 'require', + 'contract_id' => 'require|checkContract', 'negotiation_name' => 'require', - 'negotiation_no' => 'require', + 'negotiation_amount' => 'require|float|gt:0', + 'negotiation_type' => 'require|checkNegotiationType', + 'labor_costs' => 'float|egt:0', + 'material_costs' => 'float|egt:0', + 'warranty_amount' => 'float|egt:0', + 'warranty_expire_date' => 'dateFormat:Y-m-d', + 'profit' => 'float|egt:0', + 'negotiation_quotation' => 'checkAnnex', + 'negotiation_basis' => 'checkAnnex' ]; - - /** - * 参数描述 - * @var string[] - */ - protected $field = [ - 'id' => 'id', + protected $message = [ + 'id' => 'require', + 'contract_id' => 'require|checkContract', + 'negotiation_name' => 'require', + 'negotiation_amount' => 'require|float|gt:0', + 'negotiation_type' => 'require|checkNegotiationType', + 'labor_costs' => 'float|egt:0', + 'material_costs' => 'float|egt:0', + 'warranty_amount' => 'float|egt:0', + 'warranty_expire_date' => 'dateFormat:Y-m-d', + 'profit' => 'float|egt:0', ];