From 855f095cf5bc79390b5cdaaa5ba1f8f70f92286c Mon Sep 17 00:00:00 2001 From: liyinglin Date: Fri, 31 Mar 2023 13:20:19 +0800 Subject: [PATCH] 1 --- .../Controllers/Admin/ChartController.php | 23 +++++++++++++++++++ .../Controllers/Admin/VisitController.php | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ChartController.php b/app/Http/Controllers/Admin/ChartController.php index 744b5c9..4903c93 100644 --- a/app/Http/Controllers/Admin/ChartController.php +++ b/app/Http/Controllers/Admin/ChartController.php @@ -15,6 +15,29 @@ use Rap2hpoutre\FastExcel\FastExcel; class ChartController extends CommonController { + /** + * @OA\Get( + * path="/api/admin/chart/home", + * tags={"图表"}, + * summary="首页统计", + * description="", + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Response( + * response="200", + * description="暂无" + * ) + * ) + */ + public function home(){ + $list = [ + + + + ]; + return $this->success(compact('list')); + } + + /** * @OA\Get( * path="/api/admin/chart/month", diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 9ede84b..19df06c 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -73,8 +73,8 @@ class VisitController extends CommonController $user = $this->getUser(); $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { - $qry->whereIn('department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { - $qry->whereIn('admin_id', $adminIds); + $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { + $qry->whereIn('accept_admin_id', $adminIds); }); }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc');