gx

@@ -42,7 +42,6 @@ class OnlineCheckLogic extends BaseLogic
     public function saveOnlineCheck(){
     public function saveOnlineCheck(){
         $info = $this->model->read(['project_id'=>$this->param['id']]);
         $info = $this->model->read(['project_id'=>$this->param['id']]);
         if($info !== false){
         if($info !== false){
-            //组装数据
             $rs = $this->model->edit($this->param,['id'=>$info['id']]);
             $rs = $this->model->edit($this->param,['id'=>$info['id']]);
         }else{
         }else{
             //组装数据
             //组装数据

@@ -41,7 +41,7 @@ class ProjectLogic extends BaseLogic
 
 
     public function getList(array $map = [], array $sort = ['id' => 'desc'], array $columns = ['*'], int $limit = 20)
     public function getList(array $map = [], array $sort = ['id' => 'desc'], array $columns = ['*'], int $limit = 20)
     {
     {
-        parent::setWith(['payment', 'deploy_build', 'deploy_optimize']);
+        parent::setWith(['payment', 'deploy_build', 'deploy_optimize','online_check']);
         $list =  parent::getList($map, $sort, ['id', 'title', 'channel', 'type', 'created_at'], $limit);
         $list =  parent::getList($map, $sort, ['id', 'title', 'channel', 'type', 'created_at'], $limit);
         foreach ($list['list'] as &$item){
         foreach ($list['list'] as &$item){
             $item = [
             $item = [
@@ -69,6 +69,8 @@ class ProjectLogic extends BaseLogic
                 'article_num' => Blog::getNumByProjectId($item['id']) + News::getNumByProjectId($item['id']),
                 'article_num' => Blog::getNumByProjectId($item['id']) + News::getNumByProjectId($item['id']),
                 'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),
                 'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),
                 'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
                 'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
+                'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
+                'qa_status'=>$item['online_check']['qa_status'] ?? 0,
             ];
             ];
         }
         }
         return $list;
         return $list;