Merge branch 'master' of 47.101.48.251:/data/git/bd-fangke

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();

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.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('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);
     }
 

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);
     }
 

app/Http/Controllers/Mobile/VisitController.php

@@ -43,6 +43,8 @@ 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="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是"),
@@ -91,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
                 ]);

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');

database/migrations/2023_06_30_140230_alert_visits_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('visits', function (Blueprint $table) {
+            $table->integer('accompany_id')->nullable()->comment('陪同人id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('visits', function (Blueprint $table) {
+            $table->dropColumn('accompany_id');
+        });
+    }
+};