作者 lyh

gx

@@ -87,6 +87,7 @@ class ProjectController extends BaseController @@ -87,6 +87,7 @@ class ProjectController extends BaseController
87 'gl_project.channel AS channel', 87 'gl_project.channel AS channel',
88 'gl_project.company AS company', 88 'gl_project.company AS company',
89 'gl_project.type AS type', 89 'gl_project.type AS type',
  90 + 'gl_project.extend_type AS extend_type',
90 'gl_project.uptime AS uptime', 91 'gl_project.uptime AS uptime',
91 'gl_project.is_upgrade AS is_upgrade', 92 'gl_project.is_upgrade AS is_upgrade',
92 'gl_project.created_at AS created_at', 93 'gl_project.created_at AS created_at',
@@ -173,6 +174,7 @@ class ProjectController extends BaseController @@ -173,6 +174,7 @@ class ProjectController extends BaseController
173 else{ 174 else{
174 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]); 175 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
175 } 176 }
  177 + $query->where('gl_project.extend_type', '!=' ,5);
176 } 178 }
177 if(isset($this->map['uptime']) && is_array($this->map['uptime'])){ 179 if(isset($this->map['uptime']) && is_array($this->map['uptime'])){
178 $query->whereBetween('gl_project.uptime', $this->map['uptime']); 180 $query->whereBetween('gl_project.uptime', $this->map['uptime']);