diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 7f48927..b98d793 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -81,19 +81,18 @@ class VisitController extends CommonController if (isset($all['is_export']) && !empty($all['is_export'])) { 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['created_at']??'', ]; }); } else { diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index e804612..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) { @@ -325,8 +325,8 @@ class VisitController extends CommonController } $model = new StudyLog(); $list = $model->whereIn('idcard', $all['idcard'])->pluck('idcard'); - $diff = collect($all['idcard'])->diffAssoc($list); - if($diff->isNotEmpty()){ + $diff = collect($all['idcard'])->diff($list); + 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..1b0dc0c 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 { @@ -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; }