From 39de9d532f79a6d62a45211654f9cc3e3cbc92d5 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 26 Apr 2023 16:40:47 +0800 Subject: [PATCH 1/5] 1 --- app/Models/Blacklist.php | 2 +- app/Models/GateLog.php | 4 ++-- app/Models/Study.php | 2 +- app/Models/Visit.php | 10 +++++----- app/Models/VisitArea.php | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Models/Blacklist.php b/app/Models/Blacklist.php index d07e29a..d9c42c3 100644 --- a/app/Models/Blacklist.php +++ b/app/Models/Blacklist.php @@ -8,7 +8,7 @@ class Blacklist extends SoftDeletesModel protected $appends = ['file_detail']; protected $casts = [ - 'file'=>'array' + 'file'=>'json' ]; public function getFileDetailAttribute() diff --git a/app/Models/GateLog.php b/app/Models/GateLog.php index a40393c..789d02d 100644 --- a/app/Models/GateLog.php +++ b/app/Models/GateLog.php @@ -7,8 +7,8 @@ class GateLog extends CommonModel protected $guarded = ['id']; protected $casts = [ - 'person_no' => 'array', - 'car_no' => 'array' + 'person_no' => 'json', + 'car_no' => 'json' ]; public static function add($admin_id, $code, $person_no, $car_no, $remark = '') diff --git a/app/Models/Study.php b/app/Models/Study.php index 86fdf41..df21bbb 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -7,7 +7,7 @@ class Study extends SoftDeletesModel protected $guarded = ['id']; protected $casts = [ - 'file' => 'array' + 'file' => 'json' ]; protected $appends = ['file_detail']; diff --git a/app/Models/Visit.php b/app/Models/Visit.php index ce992f0..40fa81f 100644 --- a/app/Models/Visit.php +++ b/app/Models/Visit.php @@ -11,11 +11,11 @@ class Visit extends SoftDeletesModel protected $appends = ['type_text', 'audit_status_text', 'file_detail']; protected $casts = [ - 'follw_people' => 'array', - 'cars' => 'array', - 'file' => 'array', - 'person_no' => 'array', - 'car_no' => 'array' + 'follw_people' => 'json', + 'cars' => 'json', + 'file' => 'json', + 'person_no' => 'json', + 'car_no' => 'json' ]; public function getFileDetailAttribute() diff --git a/app/Models/VisitArea.php b/app/Models/VisitArea.php index 8594ec2..fdc4c29 100644 --- a/app/Models/VisitArea.php +++ b/app/Models/VisitArea.php @@ -7,6 +7,6 @@ class VisitArea extends SoftDeletesModel protected $guarded = ['id']; protected $casts = [ - 'audit_admin' => 'array' + 'audit_admin' => 'json' ]; } From c6f1ea13974e0400b8409a9c26c3d0e1031b4e98 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 26 Apr 2023 16:43:22 +0800 Subject: [PATCH 2/5] 1 --- app/Http/Controllers/Admin/GateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index 3dbbda6..aa88807 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -128,7 +128,7 @@ class GateController extends CommonController if ($all['type'] == 2) { $remark = '离厂'; } - $gateLog = GateLog::add($all['admin_id'], $all['code'], $all['person_no'], $all['car_no'], $remark); + $gateLog = GateLog::add($all['admin_id'], $all['code'], $all['person_no']??[], $all['car_no']??[], $remark); if ($all['type'] == 1) { Visit::where('code', $all['code'])->update(['audit_status' => 3, 'person_no' => $all['person_no'], 'car_no' => $all['car_no']]); } From 37c9a54ab205ba3347fea672cf5f16bbea69faa2 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 26 Apr 2023 16:44:11 +0800 Subject: [PATCH 3/5] 1 --- app/Http/Controllers/Admin/GateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index aa88807..e71516b 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -130,7 +130,7 @@ class GateController extends CommonController } $gateLog = GateLog::add($all['admin_id'], $all['code'], $all['person_no']??[], $all['car_no']??[], $remark); if ($all['type'] == 1) { - Visit::where('code', $all['code'])->update(['audit_status' => 3, 'person_no' => $all['person_no'], 'car_no' => $all['car_no']]); + Visit::where('code', $all['code'])->update(['audit_status' => 3, 'person_no' => $all['person_no']??'', 'car_no' => $all['car_no']??'']); } if ($all['type'] == 2) { Visit::where('code', $all['code'])->update(['audit_status' => 4]); From 144745c9a92b232518f9538abcbd5e9e17ee05f3 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 26 Apr 2023 16:48:53 +0800 Subject: [PATCH 4/5] 1 --- app/Http/Controllers/Mobile/VisitController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index b71511f..5853246 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -235,7 +235,7 @@ class VisitController extends CommonController public function askLog() { $type = request('type'); - $log = StudyLog::where('type', $type)->orderBy('id', 'desc')->first(); + $log = StudyLog::where('type', $type)->where('user_id', $this->getUserId())->orderBy('id', 'desc')->first(); if (empty($log)) { return $this->fail([ResponseCode::ERROR_BUSINESS, '未学习']); } From 2f5f1ee707687b549b52be97b890cfe0c496fe0b Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 27 Apr 2023 10:42:07 +0800 Subject: [PATCH 5/5] 1 --- app/Http/Controllers/Mobile/VisitController.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 5853246..7ee58ca 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -88,8 +88,16 @@ class VisitController extends CommonController // 创建时候审核流程写入 $area = VisitArea::find($all['visit_area_id']); if ($area->audit_admin && !isset($all['id'])) { + // 被访问做第一级审核 + VisitAudit::create([ + 'visit_id' => $model->id, + 'audit_admin_id' => $all['accept_admin_id'], + 'status' => 0, + 'level' => 0 + ]); + // 其他按设置审核 $audit_admin = collect($area->audit_admin)->sortBy('level'); - foreach ($audit_admin as $item) { + foreach ($audit_admin as $key => $item) { if (empty($item['admin_id'])) { // 上级审核 $admin = Admin::find($all['accept_admin_id']); @@ -102,11 +110,15 @@ class VisitController extends CommonController } $item['admin_id'] = $department->manager_id; } + // 判断不能重复 + if ($item['admin_id'] == $all['accept_admin_id']) { + continue; + } VisitAudit::create([ 'visit_id' => $model->id, 'audit_admin_id' => $item['admin_id'], 'status' => 0, - 'level' => $item['level'] + 'level' => $item['level'] + 1 ]); } }