From 913f5689500d178b667495cba34a0e2c38d5a00e Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 27 Sep 2023 16:00:14 +0800 Subject: [PATCH 01/10] 1 --- app/Http/Controllers/Mobile/VisitController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index e804612..39b595a 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -325,6 +325,7 @@ class VisitController extends CommonController } $model = new StudyLog(); $list = $model->whereIn('idcard', $all['idcard'])->pluck('idcard'); + dd($list); $diff = collect($all['idcard'])->diffAssoc($list); if($diff->isNotEmpty()){ $diff = array_values($diff->toArray()); From 94d6a25513f71c0aa1e88587662ba7eb3c883fb1 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 27 Sep 2023 16:01:12 +0800 Subject: [PATCH 02/10] no message --- app/Http/Controllers/Mobile/VisitController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 39b595a..47a39d9 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -325,8 +325,7 @@ class VisitController extends CommonController } $model = new StudyLog(); $list = $model->whereIn('idcard', $all['idcard'])->pluck('idcard'); - dd($list); - $diff = collect($all['idcard'])->diffAssoc($list); + $diff = collect($all['idcard'])->diff($list); if($diff->isNotEmpty()){ $diff = array_values($diff->toArray()); } From 30be107262c857acc96573504e56870a4022221e Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 18 Oct 2023 10:57:43 +0800 Subject: [PATCH 03/10] 1 --- app/Http/Controllers/Mobile/VisitController.php | 4 ++-- app/Models/VisitAudit.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 47a39d9..749b1fd 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -153,7 +153,7 @@ class VisitController extends CommonController $template_id = '5wReg1'; sms($acceptAdmin->mobile, $vars, $template_id); // 短信通知第一个审核人 - VisitAudit::smsNextAudit($model); + VisitAudit::smsNextAudit($model, -1); DB::commit(); return $this->success('更新成功'); } catch (\Exception $exception) { @@ -326,7 +326,7 @@ class VisitController extends CommonController $model = new StudyLog(); $list = $model->whereIn('idcard', $all['idcard'])->pluck('idcard'); $diff = collect($all['idcard'])->diff($list); - if($diff->isNotEmpty()){ + if ($diff->isNotEmpty()) { $diff = array_values($diff->toArray()); } return $this->success($diff); diff --git a/app/Models/VisitAudit.php b/app/Models/VisitAudit.php index 98b3d51..0630777 100644 --- a/app/Models/VisitAudit.php +++ b/app/Models/VisitAudit.php @@ -19,11 +19,11 @@ class VisitAudit extends SoftDeletesModel /** * 短信通知下一个审核人 */ - public static function smsNextAudit($visit, $nowVisitAuditLevel = 0) + public static function smsNextAudit($visit, $nowVisitAuditLevel = -1) { // 通知下一个审核人 $mobile = Admin::where(function ($query) use ($visit, $nowVisitAuditLevel) { - if ($nowVisitAuditLevel == 0) { + if ($nowVisitAuditLevel == -1) { // 通知第一个审核人 $adminId = VisitAudit::where('visit_id', $visit->id)->orderBy('level', 'asc')->value('audit_admin_id'); } else { From 4e82a421a2d699181069d359e087897cadeba8ec Mon Sep 17 00:00:00 2001 From: liyinglin Date: Mon, 20 Nov 2023 09:44:25 +0800 Subject: [PATCH 04/10] 1 --- app/Models/VisitAudit.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Models/VisitAudit.php b/app/Models/VisitAudit.php index 0630777..1b0dc0c 100644 --- a/app/Models/VisitAudit.php +++ b/app/Models/VisitAudit.php @@ -38,7 +38,13 @@ class VisitAudit extends SoftDeletesModel return false; } $vars = ['date' => $visit->date, 'name' => $visit->name, 'phone_number' => $visit->mobile]; - $template_id = 'uAQaB4'; + if ($nowVisitAuditLevel == -1) { + $template_id = 'uAQaB4'; + } else { + $uname = Admin::where('id', $visit->accept_admin_id)->value('name'); + $vars = ['date' => $visit->date, 'name' => $visit->name, 'phone_number' => $visit->mobile, 'uname' => $uname]; + $template_id = 'QXPs33'; + } sms($mobile, $vars, $template_id); return true; } From 07430c6028e0d8a8ceb00d579b84e7ace4398f51 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 23 Nov 2023 14:21:06 +0800 Subject: [PATCH 05/10] 1 --- app/Http/Controllers/Admin/VisitController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 7f48927..31f1d05 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -70,13 +70,13 @@ class VisitController extends CommonController }); } // 权限设置 - $user = $this->getUser(); - $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); - $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { - $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { - $qry->whereIn('accept_admin_id', $adminIds); - }); - }); +// $user = $this->getUser(); +// $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); +// $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { +// $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'); if (isset($all['is_export']) && !empty($all['is_export'])) { return (new FastExcel($list->limit(5000)->get()->toArray()))->download('访问记录' . date('YmdHis') . '.csv', function ($info) { From 46ea08ea0a21e3c91449b7a423f0899a65eed143 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 23 Nov 2023 14:27:02 +0800 Subject: [PATCH 06/10] 1 --- app/Http/Controllers/Admin/VisitController.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 31f1d05..6cf3c6c 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -70,13 +70,14 @@ class VisitController extends CommonController }); } // 权限设置 -// $user = $this->getUser(); -// $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); -// $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { -// $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { -// $qry->whereIn('accept_admin_id', $adminIds); -// }); -// }); + $user = $this->getUser(); + $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); + dd($adminIds,$departmentIds); + $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { + $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'); if (isset($all['is_export']) && !empty($all['is_export'])) { return (new FastExcel($list->limit(5000)->get()->toArray()))->download('访问记录' . date('YmdHis') . '.csv', function ($info) { From f2a35a645fbc19aa44e2262833bb53d01690bf94 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 23 Nov 2023 14:30:01 +0800 Subject: [PATCH 07/10] 1 --- app/Http/Controllers/Admin/VisitController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 6cf3c6c..7f48927 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -72,7 +72,6 @@ class VisitController extends CommonController // 权限设置 $user = $this->getUser(); $adminIds = Admin::roleAllowAdminIds($user, $departmentIds); - dd($adminIds,$departmentIds); $query->where(function ($qry) use ($adminIds, $departmentIds, $user) { $qry->whereIn('accpet_department_id', $departmentIds)->orWhere(function ($qry) use ($adminIds) { $qry->whereIn('accept_admin_id', $adminIds); From 014a456ef692dfead609f3cc1c3e5f81a3433b5d Mon Sep 17 00:00:00 2001 From: liyinglin Date: Tue, 26 Dec 2023 13:44:09 +0800 Subject: [PATCH 08/10] 1 --- app/Http/Controllers/Admin/VisitController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 7f48927..2a25e86 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -79,6 +79,7 @@ class VisitController extends CommonController }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); if (isset($all['is_export']) && !empty($all['is_export'])) { + dd($list->limit(5000)->get()->toArray()); return (new FastExcel($list->limit(5000)->get()->toArray()))->download('访问记录' . date('YmdHis') . '.csv', function ($info) { return [ '姓名' => $info['name'], From 4795e365bb842de16ca6cddbd5e2936fed13f26e Mon Sep 17 00:00:00 2001 From: liyinglin Date: Tue, 26 Dec 2023 14:07:21 +0800 Subject: [PATCH 09/10] 1 --- .../Controllers/Admin/VisitController.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 2a25e86..460c93a 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -79,22 +79,21 @@ class VisitController extends CommonController }); })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); if (isset($all['is_export']) && !empty($all['is_export'])) { - dd($list->limit(5000)->get()->toArray()); return (new FastExcel($list->limit(5000)->get()->toArray()))->download('访问记录' . date('YmdHis') . '.csv', function ($info) { return [ - '姓名' => $info['name'], - '类型' => $info['type_text'], - '审核状态' => $info['audit_status_text'], + '姓名' => $info['name']??'', + '类型' => $info['type_text']??'', + '审核状态' => $info['audit_status_text']??'', '是否随访' => empty($info['follw_people']) ? '否' : '是', - '预约时间' => $info['date'], - '证件号' => $info['idcard'], + '预约时间' => $info['date']??'', + '证件号' => $info['idcard']??'', '证件类型' => $info['credent'] == 1 ? '身份证' : '护照', - '单位名称' => $info['company_name'], - '手机号' => $info['mobile'], + '单位名称' => $info['company_name']??'', + '手机号' => $info['mobile']??'', '访问时间' => ($info['visit_time']['start_time']) ?? '', '结束时间' => ($info['visit_time']['end_time']) ?? '', - '创建人' => $info['admin']['name'], - '创建时间' => $info['created_at'], + '创建人' => $info['admin']['name']??'', + '创建时间' => $info['created_at']??'', ]; }); } else { From 58c08215f5773a24325850e2f23fc857edc45c5a Mon Sep 17 00:00:00 2001 From: liyinglin Date: Tue, 26 Dec 2023 14:19:31 +0800 Subject: [PATCH 10/10] 1 --- app/Http/Controllers/Admin/VisitController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 460c93a..b98d793 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -92,7 +92,6 @@ class VisitController extends CommonController '手机号' => $info['mobile']??'', '访问时间' => ($info['visit_time']['start_time']) ?? '', '结束时间' => ($info['visit_time']['end_time']) ?? '', - '创建人' => $info['admin']['name']??'', '创建时间' => $info['created_at']??'', ]; });