diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index 79ae530..e35511b 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -52,6 +52,9 @@ class GateController extends CommonController * @OA\Parameter(name="page", in="query", @OA\Schema(type="string"), required=false, description="页码"), * @OA\Parameter(name="sort_name", in="query", @OA\Schema(type="string"), required=false, description="排序字段名字"), * @OA\Parameter(name="sort_type", in="query", @OA\Schema(type="string"), required=false, description="排序类型"), + * @OA\Parameter(name="code", in="query", @OA\Schema(type="string"), required=false, description="编码"), + * @OA\Parameter(name="car_no", in="query", @OA\Schema(type="string"), required=false, description="停车牌"), + * @OA\Parameter(name="person_no", in="query", @OA\Schema(type="string"), required=false, description="人牌"), * @OA\Parameter(name="is_export", in="query", @OA\Schema(type="string"), required=false, description="是否导出0否1是,默认0"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Response( @@ -70,6 +73,9 @@ class GateController extends CommonController if (isset($all['audit_status'])) { $query->where('audit_status', $all['audit_status']); } + if (isset($all['code'])) { + $query->where('code', $all['code']); + } if (isset($all['start_date']) && isset($all['end_date'])) { $query->whereBetween('date', [$all['start_date'], $all['end_date']]); } @@ -85,6 +91,8 @@ class GateController extends CommonController * description="", * @OA\Parameter(name="admin_id", in="query", @OA\Schema(type="string"), required=false, description="管理员id"), * @OA\Parameter(name="code", in="query", @OA\Schema(type="string"), required=false, description="编码"), + * @OA\Parameter(name="car_no", in="query", @OA\Schema(type="string"), required=false, description="停车牌"), + * @OA\Parameter(name="person_no", in="query", @OA\Schema(type="string"), required=false, description="人牌"), * @OA\Parameter(name="type", in="query", @OA\Schema(type="string"), required=false, description="1进厂2离厂"), * @OA\Response( * response="200", @@ -125,5 +133,4 @@ class GateController extends CommonController } return $this->success($gateLog); } - } diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index bae8726..8fef74c 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -123,10 +123,10 @@ class VisitController extends CommonController 'value' => $all['mobile'] ], 'name4' => [ - 'value' => $acceptAdmin->name??'', + 'value' => $acceptAdmin->name ?? '', ], 'thing6' => [ - 'value' => $accpetDepartment->name??'' + 'value' => $accpetDepartment->name ?? '' ], ]; Visit::subMsg('DmzNRREPFdZrMWconNDdbj_ebtVPRWufq27kRQ25eNg', $this->getUser()->openid, $templateData); diff --git a/database/migrations/2023_03_31_095640_alert_visits_table.php b/database/migrations/2023_03_31_095640_alert_visits_table.php new file mode 100644 index 0000000..35f7a92 --- /dev/null +++ b/database/migrations/2023_03_31_095640_alert_visits_table.php @@ -0,0 +1,33 @@ +string('car_no')->nullable()->comment('停车牌'); + $table->string('person_no')->nullable()->comment('人牌'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('visits', function (Blueprint $table) { + // + }); + } +};