pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

dev
Jing Li 2023-10-26 10:18:03 +08:00
parent 1cfa3715c4
commit adaddba5ce
10 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requestes/MaterielStoreRequest.php
View File

@ -22,8 +22,8 @@ class MaterielStoreRequest extends FormRequest
'quarter' => ['bail', 'required', new Quarter()],
'name' => ['bail', 'required', 'string', 'max:255'],
'type' => ['bail', 'required', new Enum(MaterielType::class)],
'lowest_price' => ['bail', 'required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'highest_price' => ['bail', 'required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
'lowest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'highest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
];
}

4
app/Http/Requestes/MaterielUpdateRequest.php
View File

@ -22,8 +22,8 @@ class MaterielUpdateRequest extends FormRequest
'quarter' => ['filled', new Quarter()],
'name' => ['filled', 'string', 'max:255'],
'type' => ['filled', new Enum(MaterielType::class)],
'lowest_price' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'highest_price' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'highest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'],
'unit' => ['filled', 'string'],
];
}

2
app/Http/Requestes/RiceShrimpFlowStoreRequest.php
View File

@ -19,7 +19,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest
'year' => ['required', 'int', new Year()],
'quarter' => ['required', new Quarter()],
'area' => ['required', 'string'],
'sales' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'sales' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'unit' => ['required', 'string'],
];
}

2
app/Http/Requestes/RiceShrimpFlowUpdateRequest.php
View File

@ -19,7 +19,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest
'year' => ['filled', 'int', new Year()],
'quarter' => ['filled', new Quarter()],
'area' => ['filled', 'string'],
'sales' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'sales' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'unit' => ['filled', 'string'],
];
}

6
app/Http/Requestes/RiceShrimpIndustryStoreRequest.php
View File

@ -18,11 +18,11 @@ class RiceShrimpIndustryStoreRequest extends FormRequest
return [
'year' => ['required', 'int', new Year()],
'quarter' => ['required', new Quarter()],
'area' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'area' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'area_unit' => ['required', 'string'],
'product_output' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_output' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_output_unit' => ['required', 'string'],
'product_value' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_value' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_value_unit' => ['required', 'string'],
];
}

6
app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php
View File

@ -18,11 +18,11 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest
return [
'year' => ['filled', 'int', new Year()],
'quarter' => ['filled', new Quarter()],
'area' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'area' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'area_unit' => ['filled', 'string'],
'product_output' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_output' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_output_unit' => ['filled', 'string'],
'product_value' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_value' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
'product_value_unit' => ['filled', 'string'],
];
}

2
app/Http/Requestes/RiceShrimpPriceStoreRequest.php
View File

@ -18,7 +18,7 @@ class RiceShrimpPriceStoreRequest extends FormRequest
return [
'year' => ['required', 'int', new Year()],
'quarter' => ['required', new Quarter()],
'price' => ['required', 'int', 'gte:0'],
'price' => ['required', 'int', 'min:0', 'max:2147483647'],
];
}

2
app/Http/Requestes/RiceShrimpPriceUpdateRequest.php
View File

@ -18,7 +18,7 @@ class RiceShrimpPriceUpdateRequest extends FormRequest
return [
'year' => ['filled', 'int', new Year()],
'quarter' => ['filled', new Quarter()],
'price' => ['filled', 'int', 'gte:0'],
'price' => ['filled', 'int', 'min:0', 'max:2147483647'],
];
}

4
app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php
View File

@ -2,8 +2,6 @@
namespace App\Http\Requestes;
use App\Models\RiceShrimpWeeklyPrice;
use App\Rules\Quarter;
use App\Rules\Year;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
@ -27,7 +25,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest
return $query->where('type_key', 'weeks-per-year');
}),
],
'price' => ['required', 'int', 'gte:0'],
'price' => ['required', 'int', 'min:0', 'max:2147483647'],
];
}

2
app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php
View File

@ -25,7 +25,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest
return $query->where('type_key', 'weeks-per-year');
}),
],
'price' => ['filled', 'int', 'gte:0'],
'price' => ['filled', 'int', 'min:0', 'max:2147483647'],
];
}