From 0955aa19bfcb99e95a3d5a7b2a6cef1063cdbe9a Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 14 Nov 2025 16:45:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ChartController.php | 9 ++++++-- .../Controllers/Mobile/VisitController.php | 22 +------------------ 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/Admin/ChartController.php b/app/Http/Controllers/Admin/ChartController.php index be29179..a0c3923 100644 --- a/app/Http/Controllers/Admin/ChartController.php +++ b/app/Http/Controllers/Admin/ChartController.php @@ -37,7 +37,7 @@ class ChartController extends CommonController $endDate = $all['end_date'] ?? null; // 构建查询条件 - $buildQuery = function($type) use ($startDate, $endDate) { + $buildQuery = function ($type) use ($startDate, $endDate) { $query = Visit::where('type', $type); if ($startDate && $endDate) { $query->whereBetween('date', [$startDate, $endDate]); @@ -55,18 +55,23 @@ class ChartController extends CommonController 'enter_visit' => $buildQuery(1)->whereNotNull('accept_admin_sign')->count(), 'today_total' => Visit::where('type', 1)->where('date', date('Y-m-d'))->count(), 'today_enter_visit' => Visit::where('type', 1)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), + // 离厂统计 + 'leave_total' => $buildQuery(1)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), ], 'work_visit' => [ 'total' => $buildQuery(2)->count(), 'enter_visit' => $buildQuery(2)->whereNotNull('accept_admin_sign')->count(), 'today_total' => Visit::where('type', 2)->where('date', date('Y-m-d'))->count(), 'today_enter_visit' => Visit::where('type', 2)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), - ], + // 离厂统计 + 'leave_total' => $buildQuery(2)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(),], 'car_visit' => [ 'total' => $buildQuery(3)->count(), 'enter_visit' => $buildQuery(3)->whereNotNull('accept_admin_sign')->count(), 'today_total' => Visit::where('type', 3)->where('date', date('Y-m-d'))->count(), 'today_enter_visit' => Visit::where('type', 3)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), + // 离厂统计 + 'leave_total' => $buildQuery(3)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), ], ]; diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index a08704f..1437545 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -127,29 +127,9 @@ class VisitController extends CommonController } } VisitLog::add('', $this->getUser(), $model->id, isset($all['id']) ? '更新拜访记录' : '新增拜访记录'); - // 通知，发订阅消息给当前用户 - $visitTime = VisitTime::find($all['visit_time_id']); + // 被访人信息 $acceptAdmin = Admin::find($all['accept_admin_id']); - $accpetDepartment = Department::find($all['accpet_department_id']); - $templateData = [ - 'date1' => [ - 'value' => $all['date'] - ], - 'name2' => [ - 'value' => $all['name'] - ], - 'phone_number3' => [ - 'value' => $all['mobile'] - ], - 'name4' => [ - 'value' => $acceptAdmin->name ?? '', - ], - 'thing6' => [ - 'value' => $accpetDepartment->name ?? '' - ], - ]; - Visit::subMsg('OfDFwAIZyXqvPgmc_czIXhveVtp3n_ftyWJEks1DSi4', $this->getUser()->openid, $templateData, $model->id); // 邮件通知被访人 $visitData = [ 'date' => $all['date'], From 0589d4b0e5657bbfdd4838023f5d006a46ff08f2 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 14 Nov 2025 17:30:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/ChartController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/ChartController.php b/app/Http/Controllers/Admin/ChartController.php index a0c3923..65d9a82 100644 --- a/app/Http/Controllers/Admin/ChartController.php +++ b/app/Http/Controllers/Admin/ChartController.php @@ -57,6 +57,8 @@ class ChartController extends CommonController 'today_enter_visit' => Visit::where('type', 1)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), // 离厂统计 'leave_total' => $buildQuery(1)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), + // 今日离厂 + 'today_leave_total' => Visit::where('type', 1)->where('date', date('Y-m-d'))->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), ], 'work_visit' => [ 'total' => $buildQuery(2)->count(), @@ -64,7 +66,10 @@ class ChartController extends CommonController 'today_total' => Visit::where('type', 2)->where('date', date('Y-m-d'))->count(), 'today_enter_visit' => Visit::where('type', 2)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), // 离厂统计 - 'leave_total' => $buildQuery(2)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(),], + 'leave_total' => $buildQuery(2)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), + // 今日离厂 + 'today_leave_total' => Visit::where('type', 2)->where('date', date('Y-m-d'))->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), + ], 'car_visit' => [ 'total' => $buildQuery(3)->count(), 'enter_visit' => $buildQuery(3)->whereNotNull('accept_admin_sign')->count(), @@ -72,6 +77,8 @@ class ChartController extends CommonController 'today_enter_visit' => Visit::where('type', 3)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), // 离厂统计 'leave_total' => $buildQuery(3)->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), + // 今日离厂 + 'today_leave_total' => Visit::where('type', 3)->where('date', date('Y-m-d'))->where('audit_status', Visit::AUDIT_STATUS_LEFT)->count(), ], ];