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

Merge pull request 'fixed' (#127) from zhangwei into dev

Browse Source 
Reviewed-on: #127
This commit is contained in:
weiz 2024-01-06 16:51:35 +08:00
commit f6789a7dc0
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}
}

31
app/adminapi/validate/contract/ContractNegotiationValidate.php
View File

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