diff --git a/app/controller/AuditController.php b/app/controller/AuditController.php new file mode 100644 index 0000000..091c5e2 --- /dev/null +++ b/app/controller/AuditController.php @@ -0,0 +1,28 @@ +param(); + $list = Audit::where('target_type', $param['target_type']) + ->when(isset($param['status']), function ($query) use ($request) { + $query->whereIn('status', $request->param('status')); + }) + ->with('target') + ->select(); + return jsonReturn(0, Lang::get('成功'), $list); + } +} diff --git a/app/model/Audit.php b/app/model/Audit.php index 9e57e17..1a73fd3 100644 --- a/app/model/Audit.php +++ b/app/model/Audit.php @@ -6,4 +6,14 @@ use app\exception\ModelException; class Audit extends Model { + /** + * 获取关联的目标模型 + */ + public function target() + { + return $this->morphTo('target', [ + '1' => Resource::class, + '2' => Content::class, + ]); + } } diff --git a/app/service/AuditService.php b/app/service/AuditService.php index 36a0d71..2686c81 100644 --- a/app/service/AuditService.php +++ b/app/service/AuditService.php @@ -18,6 +18,9 @@ class AuditService { $audit_ary = []; foreach ($ids as $id) { + //todo user_id + $audit['launch_user_id'] = 1; + $audit['launch_time'] = date('Y-m-d H:i:s'); $audit['target_id'] = $id; $audit['target_type'] = $target_type; $audit['type'] = $type; diff --git a/app/service/ProcessService.php b/app/service/ProcessService.php index 8f2ce19..24cbc4b 100644 --- a/app/service/ProcessService.php +++ b/app/service/ProcessService.php @@ -15,6 +15,7 @@ class ProcessService } /** + * @param $resource 资源 * @param $insert_audit_flag 是否需要插入审核表 * @return int * 通过流程表 获取资源上传后的状态 @@ -27,10 +28,8 @@ class ProcessService //流程停用开启 上传后状态直接是审核通过 if ($process->stop_using == 1) { $status = $this->resource_status_map['success']; - } - - //自动发起开启 上传后状态直接是等待审核 - if ($process->auto_propose == 1) { + } elseif ($process->auto_propose == 1) { + //自动发起开启 上传后状态直接是等待审核 $status = $this->resource_status_map['wait']; if ($insert_audit_flag) { (new AuditService())->addAudit([$resource->id], 1); diff --git a/route/app.php b/route/app.php index c6147a3..d3c504b 100644 --- a/route/app.php +++ b/route/app.php @@ -43,6 +43,11 @@ Route::group('resource_dir', function () { Route::post('/copy_to', 'copyTo'); //复制文件夹 })->prefix('resourceDir/'); +//审核-待处理-资源审核 +Route::group('audit', function () { + Route::get('/index', 'index'); + +})->prefix('audit/'); //后台-流程管理 Route::group('process', function () {