Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -53,6 +53,7 @@ class Speed extends BaseCommands
             $res = $googleSpeedApi->run($domain);
             $res = $googleSpeedApi->run($domain);
             if (!$res) {
             if (!$res) {
                 $error++;
                 $error++;
+                continue;
             }
             }
             if (!$model) {
             if (!$model) {
                 $model = new GoogleSpeedModel;
                 $model = new GoogleSpeedModel;

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Aside\Project;
 
 
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Project\OnlineCheckLogic;
 use App\Http\Logic\Aside\Project\ProcessRecordsLogic;
 use App\Http\Logic\Aside\Project\ProcessRecordsLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Requests\Aside\Project\ProcessRecordsRequest;
 use App\Http\Requests\Aside\Project\ProcessRecordsRequest;
@@ -170,4 +171,45 @@ class ProjectController extends BaseController
         $data = $payment->makeVisible(['contract', 'bill']);
         $data = $payment->makeVisible(['contract', 'bill']);
         return $this->success($data ? $data->toArray() : []);
         return $this->success($data ? $data->toArray() : []);
     }
     }
+
+    /**
+     * 提交审核
+     * @author zbj
+     * @date 2023/6/29
+     */
+    public function submit_check(Request $request, OnlineCheckLogic $logic){
+        $request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $data = [
+            'project_id' => $this->param['id'],
+            'created_manage_id' => $this->manage['id'],
+        ];
+        $logic->save($data);
+        return $this->success();
+    }
+
+    /**
+     * 上线审核
+     * @author zbj
+     * @date 2023/6/29
+     */
+    public function online_check(Request $request, OnlineCheckLogic $logic){
+        $request->validate([
+            'id'=>'required',
+            'type'=>'required|in:optimist,qa',
+            'status'=>'required|in:1,2'
+        ],[
+            'id.required' => 'ID不能为空',
+            'type.required' => '请选择审核类型',
+            'type.in' => '审核类型值无效',
+            'status.required' => '请选择审核状态',
+            'status.in' => '审核状态值无效',
+        ]);
+        $this->param['manage_id'] = $this->manage['id'];
+        $logic->onlineCheck($this->param);
+        return $this->success();
+    }
 }
 }

@@ -65,6 +65,8 @@ class RankDataController extends BaseController
             $model->data = $data;
             $model->data = $data;
             $model->updated_date = date('Y-m-d');
             $model->updated_date = date('Y-m-d');
             $model->save();
             $model->save();
+        }else{
+            $data = [];
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }

+<?php
+
+namespace App\Http\Logic\Aside\Project;
+
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Project\OnlineCheck;
+
+class OnlineCheckLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->model = new OnlineCheck();
+    }
+
+
+    public function onlineCheck($param){
+        $data = [
+            'project_id' => $param['id'],
+            $param['type'] . '_mid' => $param['manage_id'],
+            $param['type'] . '_check_time' => date('Y-m-d H:i:s'),
+            $param['type'] . '_status' => $param['status'],
+            'remark' => $param['remark'] ??'',
+        ];
+        $info = $this->model->where('project_id', $data['project_id'])->first();
+        if(!$info){
+            $this->fail('项目未提交审核');
+        }
+        $data['id'] = $info['id'];
+        return $this->save($data);
+    }
+}

+<?php
+
+namespace App\Models\Project;
+
+use App\Models\Base;
+
+class OnlineCheck extends Base
+{
+    //设置关联表名
+    protected $table = 'gl_project_online_check';
+
+}

@@ -135,6 +135,8 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/data_source', [Aside\Project\ProjectController::class, 'data_source'])->name('admin.project_data_source.white');
         Route::any('/data_source', [Aside\Project\ProjectController::class, 'data_source'])->name('admin.project_data_source.white');
         Route::any('/channel_source', [Aside\Project\ProjectController::class, 'channel_source'])->name('admin.project_channel_source.white');
         Route::any('/channel_source', [Aside\Project\ProjectController::class, 'channel_source'])->name('admin.project_channel_source.white');
         Route::any('/city_source', [Aside\Project\ProjectController::class, 'city_source'])->name('admin.project_city_source.white');
         Route::any('/city_source', [Aside\Project\ProjectController::class, 'city_source'])->name('admin.project_city_source.white');
+        Route::any('/submit_check', [Aside\Project\ProjectController::class, 'submit_check'])->name('admin.project_submit_check');
+        Route::any('/online_check', [Aside\Project\ProjectController::class, 'online_check'])->name('admin.project_online_check');
     });
     });
 
 
     //工单管理
     //工单管理