diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php index e106fce..bdb1b54 100644 --- a/app/Http/Controllers/Admin/AdminController.php +++ b/app/Http/Controllers/Admin/AdminController.php @@ -30,6 +30,7 @@ class AdminController extends CommonController */ public function index() { + $all = \request()->all(); $data = (new Admin())->with(["roles", "department"])->orderBy("sortnumber"); if (request()->keyword) { $data = $data->where(function ($query) { diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index 8882e7a..79ae530 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -63,7 +63,7 @@ class GateController extends CommonController public function visitList() { $all = request()->all(); - $list = Visit::with('visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where(function ($query) use ($all) { + $list = Visit::with('logs.admin','logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where(function ($query) use ($all) { if (isset($all['keyword'])) { $query->where('name', 'like', '%' . $all['keyword'] . '%'); } diff --git a/app/Http/Controllers/Admin/VisitAuditController.php b/app/Http/Controllers/Admin/VisitAuditController.php index 6a4ded0..6c3a291 100644 --- a/app/Http/Controllers/Admin/VisitAuditController.php +++ b/app/Http/Controllers/Admin/VisitAuditController.php @@ -2,8 +2,10 @@ namespace App\Http\Controllers\Admin; +use App\Models\Admin; use App\Models\Visit; use App\Models\VisitAudit; +use App\Models\VisitLog; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Validator; use App\Helpers\ResponseCode; @@ -135,6 +137,9 @@ class VisitAuditController extends CommonController // 如果全部审核通过则拜访通过 $noPass = VisitAudit::where('visit_id', $all['visit_id'])->whereIn('status', [0, 2])->count(); if (empty($noPass)) Visit::where('id', $all['visit_id'])->update(['audit_status' => 1]); + // 审核记录 + $auditAdmin = Admin::find($model->audit_admin_id); + VisitLog::add($this->getUser(), '', $all['visit_id'], $auditAdmin->name . '审核' . $all['status'] == 1 ? '通过' : '驳回'); DB::commit(); return $this->success('更新成功'); } catch (\Exception $exception) { diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 2499a31..5cc4e85 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -119,7 +119,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('logs', 'audit.auditAdmin', 'visitTime', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department', 'visitArea', 'audit.auditAdmin')->find($all['id']); + $detail = Visit::with('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 f4802f8..31722c9 100644 --- a/app/Http/Controllers/Mobile/UserController.php +++ b/app/Http/Controllers/Mobile/UserController.php @@ -161,7 +161,7 @@ class UserController extends CommonController public function myVisit() { $all = request()->all(); - $list = Visit::with('logs', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where('user_id', $this->getUserId()) + $list = Visit::with('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']); @@ -197,7 +197,7 @@ class UserController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); + $detail = Visit::with('logs.admin','logs.user','visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); return $this->success($detail); } diff --git a/app/Models/VisitLog.php b/app/Models/VisitLog.php index 13d2af6..b2cce3b 100644 --- a/app/Models/VisitLog.php +++ b/app/Models/VisitLog.php @@ -17,4 +17,12 @@ class VisitLog extends CommonModel ]); } + public function admin(){ + return $this->hasOne(Admin::class,'id','admin_id'); + } + + public function user(){ + return $this->hasOne(User::class,'id','user_id'); + } + }