|
...
|
...
|
@@ -63,8 +63,7 @@ class ProjectController extends BaseController |
|
|
|
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
|
|
|
|
->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
|
|
|
|
->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id')
|
|
|
|
->where('gl_project.delete_status',Project::TYPE_ZERO)
|
|
|
|
->where('gl_project.extend_type',Project::TYPE_ZERO);
|
|
|
|
->where('gl_project.delete_status',Project::TYPE_ZERO);
|
|
|
|
$query = $this->searchParam($query);
|
|
|
|
$query = $this->orderByList($query);
|
|
|
|
$lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
|
|
...
|
...
|
@@ -368,7 +367,7 @@ class ProjectController extends BaseController |
|
|
|
$item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
|
|
|
|
$item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
|
|
|
|
$item['collect_time'] = $item['is_upgrade'] ? UpdateLog::getProjectUpdate($item['id']) : '';
|
|
|
|
|
|
|
|
|
|
|
|
return $item;
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|