修复基地产量

dev
Jing Li 2023-10-26 14:41:07 +08:00
parent c857350b52
commit 00c7ef9de8
2 changed files with 6 additions and 6 deletions

View File

@ -20,9 +20,9 @@ class CropYieldRequest extends FormRequest
'quarter' => 'required|integer|min:1|max:4',
'crop_id' => 'required|integer|min:0',
'base_id' => 'required|integer|min:0',
'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'output' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
];
}

View File

@ -19,9 +19,9 @@ class CropYieldUpdateRequest extends FormRequest
'time_year' => 'required|date_format:Y',
'crop_id' => 'required|integer|min:0',
'base_id' => 'required|integer|min:0',
'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'output' => 'required|regex:/^\d+(\.\d{1,2})?$/',
'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
];
}