重点产业数据校验
parent
baf96dd997
commit
e13ca5cf4b
|
|
@ -4,6 +4,7 @@ namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Enums\MaterielType;
|
use App\Enums\MaterielType;
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rules\Enum;
|
use Illuminate\Validation\Rules\Enum;
|
||||||
|
|
||||||
|
|
@ -17,7 +18,7 @@ class MaterielStoreRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['bail', 'required', 'int'],
|
'year' => ['bail', 'required', 'int', new Year()],
|
||||||
'quarter' => ['bail', 'required', new Quarter()],
|
'quarter' => ['bail', 'required', new Quarter()],
|
||||||
'name' => ['bail', 'required', 'string', 'max:255'],
|
'name' => ['bail', 'required', 'string', 'max:255'],
|
||||||
'type' => ['bail', 'required', new Enum(MaterielType::class)],
|
'type' => ['bail', 'required', new Enum(MaterielType::class)],
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Enums\MaterielType;
|
use App\Enums\MaterielType;
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rules\Enum;
|
use Illuminate\Validation\Rules\Enum;
|
||||||
|
|
||||||
|
|
@ -17,7 +18,7 @@ class MaterielUpdateRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int'],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'name' => ['filled', 'string', 'max:255'],
|
'name' => ['filled', 'string', 'max:255'],
|
||||||
'type' => ['filled', new Enum(MaterielType::class)],
|
'type' => ['filled', new Enum(MaterielType::class)],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpFlowStoreRequest extends FormRequest
|
class RiceShrimpFlowStoreRequest extends FormRequest
|
||||||
|
|
@ -15,7 +16,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['required', 'int'],
|
'year' => ['required', 'int', new Year()],
|
||||||
'quarter' => ['required', new Quarter()],
|
'quarter' => ['required', new Quarter()],
|
||||||
'area' => ['required', 'string'],
|
'area' => ['required', 'string'],
|
||||||
'sales' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
'sales' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpFlowUpdateRequest extends FormRequest
|
class RiceShrimpFlowUpdateRequest extends FormRequest
|
||||||
|
|
@ -15,7 +16,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int'],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'area' => ['filled', 'string'],
|
'area' => ['filled', 'string'],
|
||||||
'sales' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
'sales' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpIndustryStoreRequest extends FormRequest
|
class RiceShrimpIndustryStoreRequest extends FormRequest
|
||||||
|
|
@ -15,7 +16,7 @@ class RiceShrimpIndustryStoreRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['required', 'int'],
|
'year' => ['required', 'int', new Year()],
|
||||||
'quarter' => ['required', new Quarter()],
|
'quarter' => ['required', new Quarter()],
|
||||||
'area' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
'area' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
||||||
'area_unit' => ['required', 'string'],
|
'area_unit' => ['required', 'string'],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpIndustryUpdateRequest extends FormRequest
|
class RiceShrimpIndustryUpdateRequest extends FormRequest
|
||||||
|
|
@ -15,7 +16,7 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int'],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'area' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
'area' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
|
||||||
'area_unit' => ['filled', 'string'],
|
'area_unit' => ['filled', 'string'],
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpPriceStoreRequest extends FormRequest
|
class RiceShrimpPriceStoreRequest extends FormRequest
|
||||||
|
|
@ -15,9 +16,9 @@ class RiceShrimpPriceStoreRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['required', 'int'],
|
'year' => ['required', 'int', new Year()],
|
||||||
'quarter' => ['required', new Quarter()],
|
'quarter' => ['required', new Quarter()],
|
||||||
'price' => ['required', 'int'],
|
'price' => ['required', 'int', 'gte:0'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
class RiceShrimpPriceUpdateRequest extends FormRequest
|
class RiceShrimpPriceUpdateRequest extends FormRequest
|
||||||
|
|
@ -15,9 +16,9 @@ class RiceShrimpPriceUpdateRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int'],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'quarter' => ['filled', new Quarter()],
|
'quarter' => ['filled', new Quarter()],
|
||||||
'price' => ['filled', 'int'],
|
'price' => ['filled', 'int', 'gte:0'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace App\Http\Requestes;
|
||||||
|
|
||||||
use App\Models\RiceShrimpWeeklyPrice;
|
use App\Models\RiceShrimpWeeklyPrice;
|
||||||
use App\Rules\Quarter;
|
use App\Rules\Quarter;
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Peidikeji\Keywords\Models\Keywords;
|
use Peidikeji\Keywords\Models\Keywords;
|
||||||
|
|
@ -18,7 +19,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['required', 'int'],
|
'year' => ['required', 'int', new Year()],
|
||||||
'week' => [
|
'week' => [
|
||||||
'required',
|
'required',
|
||||||
'int',
|
'int',
|
||||||
|
|
@ -26,7 +27,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest
|
||||||
return $query->where('type_key', 'weeks-per-year');
|
return $query->where('type_key', 'weeks-per-year');
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
'price' => ['required', 'int'],
|
'price' => ['required', 'int', 'gte:0'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace App\Http\Requestes;
|
namespace App\Http\Requestes;
|
||||||
|
|
||||||
|
use App\Rules\Year;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Peidikeji\Keywords\Models\Keywords;
|
use Peidikeji\Keywords\Models\Keywords;
|
||||||
|
|
@ -16,7 +17,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'year' => ['filled', 'int'],
|
'year' => ['filled', 'int', new Year()],
|
||||||
'week' => [
|
'week' => [
|
||||||
'filled',
|
'filled',
|
||||||
'int',
|
'int',
|
||||||
|
|
@ -24,7 +25,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest
|
||||||
return $query->where('type_key', 'weeks-per-year');
|
return $query->where('type_key', 'weeks-per-year');
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
'price' => ['filled', 'int'],
|
'price' => ['filled', 'int', 'gte:0'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Rules;
|
||||||
|
|
||||||
|
use Illuminate\Contracts\Validation\Rule;
|
||||||
|
|
||||||
|
class Year implements Rule
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determine if the validation rule passes.
|
||||||
|
*
|
||||||
|
* @param string $attribute
|
||||||
|
* @param mixed $value
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function passes($attribute, $value)
|
||||||
|
{
|
||||||
|
return $value <= now()->year;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the validation error message.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function message()
|
||||||
|
{
|
||||||
|
return ':attribute 不能超过现在';
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue