From 223db678a9c2aad62a4d21c15ed88576a86888ae Mon Sep 17 00:00:00 2001 From: liyinglin Date: Mon, 8 May 2023 16:44:55 +0800 Subject: [PATCH 1/4] 1 --- app/Http/Controllers/Admin/UploadController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/UploadController.php b/app/Http/Controllers/Admin/UploadController.php index 0905e7f..9548679 100644 --- a/app/Http/Controllers/Admin/UploadController.php +++ b/app/Http/Controllers/Admin/UploadController.php @@ -28,8 +28,8 @@ class UploadController extends CommonController $file = $request->file('file'); //获取文件大小,单位B $fileSize = floor($file->getSize()); - if ($fileSize >= 10 * 1024 *1024) { - return $this->fail([ResponseCode::ERROR_BUSINESS, '文件必须小于10M']); + if ($fileSize >= 200 * 1024 *1024) { + return $this->fail([ResponseCode::ERROR_BUSINESS, '文件必须小于200M']); } //过滤文件后缀 $ext = $file->getClientOriginalExtension(); From a1d0534b95d944f02630755c6073d6661a91c961 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Fri, 30 Jun 2023 15:49:11 +0800 Subject: [PATCH 2/4] 1 --- .../Controllers/Admin/VisitController.php | 4 +-- .../Controllers/Mobile/VisitController.php | 1 + app/Models/Visit.php | 5 +++ .../2023_06_30_140230_alert_visits_table.php | 32 +++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2023_06_30_140230_alert_visits_table.php diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index bad3bc0..c40fc49 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -45,7 +45,7 @@ class VisitController extends CommonController public function index() { $all = request()->all(); - $list = Visit::with('gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { + $list = Visit::with('accompany','gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { if (isset($all['keyword'])) { $query->where('name', 'like', '%' . $all['keyword'] . '%'); } @@ -128,7 +128,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); + $detail = Visit::with('accompany','logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); return $this->success($detail); } diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 7ee58ca..43ad518 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -43,6 +43,7 @@ class VisitController extends CommonController * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=false, description="结束时间"), * @OA\Parameter(name="accpet_department_id", in="query", @OA\Schema(type="string"), required=false, description="接待部门"), * @OA\Parameter(name="accept_admin_id", in="query", @OA\Schema(type="string"), required=false, description="接待人员"), + * @OA\Parameter(name="accompany_id", in="query", @OA\Schema(type="string"), required=false, description="陪同人id"), * @OA\Parameter(name="plate", in="query", @OA\Schema(type="string"), required=false, description="车牌号"), * @OA\Parameter(name="type", in="query", @OA\Schema(type="string"), required=false, description="类型1访客2施工3车辆"), * @OA\Parameter(name="long_time", in="query", @OA\Schema(type="string"), required=false, description="是否长期0否1是"), diff --git a/app/Models/Visit.php b/app/Models/Visit.php index 40fa81f..481c92f 100644 --- a/app/Models/Visit.php +++ b/app/Models/Visit.php @@ -48,6 +48,11 @@ class Visit extends SoftDeletesModel return $this->hasOne(Admin::class, 'id', 'admin_id'); } + public function accompany() + { + return $this->hasOne(Admin::class, 'id', 'accompany_id'); + } + public function acceptAdmin() { return $this->hasOne(Admin::class, 'id', 'accept_admin_id'); diff --git a/database/migrations/2023_06_30_140230_alert_visits_table.php b/database/migrations/2023_06_30_140230_alert_visits_table.php new file mode 100644 index 0000000..6d1b61c --- /dev/null +++ b/database/migrations/2023_06_30_140230_alert_visits_table.php @@ -0,0 +1,32 @@ +integer('accompany_id')->nullable()->comment('陪同人id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('visits', function (Blueprint $table) { + // + }); + } +}; From df52707d933ee68b92216a3cd870abb2da07393b Mon Sep 17 00:00:00 2001 From: liyinglin Date: Fri, 30 Jun 2023 16:36:55 +0800 Subject: [PATCH 3/4] 1 --- database/migrations/2023_06_30_140230_alert_visits_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2023_06_30_140230_alert_visits_table.php b/database/migrations/2023_06_30_140230_alert_visits_table.php index 6d1b61c..6d8f362 100644 --- a/database/migrations/2023_06_30_140230_alert_visits_table.php +++ b/database/migrations/2023_06_30_140230_alert_visits_table.php @@ -26,7 +26,7 @@ return new class extends Migration public function down() { Schema::table('visits', function (Blueprint $table) { - // + $table->dropColumn('accompany_id'); }); } }; From bde665c464364ca6e0f76ef60c982ccd971db10c Mon Sep 17 00:00:00 2001 From: liyinglin Date: Mon, 3 Jul 2023 13:44:58 +0800 Subject: [PATCH 4/4] 1 --- app/Http/Controllers/Admin/VisitController.php | 4 ++-- app/Http/Controllers/Mobile/UserController.php | 4 ++-- app/Http/Controllers/Mobile/VisitController.php | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index c40fc49..7f48927 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -45,7 +45,7 @@ class VisitController extends CommonController public function index() { $all = request()->all(); - $list = Visit::with('accompany','gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { + $list = Visit::with('accompany.department','gateLogs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'audit.auditAdmin')->where(function ($query) use ($all) { if (isset($all['keyword'])) { $query->where('name', 'like', '%' . $all['keyword'] . '%'); } @@ -128,7 +128,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('accompany','logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); + $detail = Visit::with('accompany.department','logs.admin', 'logs.user', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); return $this->success($detail); } diff --git a/app/Http/Controllers/Mobile/UserController.php b/app/Http/Controllers/Mobile/UserController.php index b4fc719..3afcff6 100644 --- a/app/Http/Controllers/Mobile/UserController.php +++ b/app/Http/Controllers/Mobile/UserController.php @@ -162,7 +162,7 @@ class UserController extends CommonController public function myVisit() { $all = request()->all(); - $list = Visit::with('logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where('user_id', $this->getUserId()) + $list = Visit::with('accompany.department','logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where('user_id', $this->getUserId()) ->where(function ($query) use ($all) { if (isset($all['type'])) { $query->where('type', $all['type']); @@ -198,7 +198,7 @@ class UserController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); + $detail = Visit::with('accompany.department','logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); return $this->success($detail); } diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 43ad518..a28efbd 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -44,6 +44,7 @@ class VisitController extends CommonController * @OA\Parameter(name="accpet_department_id", in="query", @OA\Schema(type="string"), required=false, description="接待部门"), * @OA\Parameter(name="accept_admin_id", in="query", @OA\Schema(type="string"), required=false, description="接待人员"), * @OA\Parameter(name="accompany_id", in="query", @OA\Schema(type="string"), required=false, description="陪同人id"), + * @OA\Parameter(name="accompany_department_id", in="query", @OA\Schema(type="string"), required=false, description="陪同人部门id"), * @OA\Parameter(name="plate", in="query", @OA\Schema(type="string"), required=false, description="车牌号"), * @OA\Parameter(name="type", in="query", @OA\Schema(type="string"), required=false, description="类型1访客2施工3车辆"), * @OA\Parameter(name="long_time", in="query", @OA\Schema(type="string"), required=false, description="是否长期0否1是"), @@ -92,7 +93,7 @@ class VisitController extends CommonController // 被访问做第一级审核 VisitAudit::create([ 'visit_id' => $model->id, - 'audit_admin_id' => $all['accept_admin_id'], + 'audit_admin_id' => $all['accompany_id'], 'status' => 0, 'level' => 0 ]);