|
...
|
...
|
@@ -87,6 +87,7 @@ class ProjectController extends BaseController |
|
|
|
'gl_project.channel AS channel',
|
|
|
|
'gl_project.company AS company',
|
|
|
|
'gl_project.type AS type',
|
|
|
|
'gl_project.extend_type AS extend_type',
|
|
|
|
'gl_project.uptime AS uptime',
|
|
|
|
'gl_project.is_upgrade AS is_upgrade',
|
|
|
|
'gl_project.created_at AS created_at',
|
|
...
|
...
|
@@ -173,6 +174,7 @@ class ProjectController extends BaseController |
|
|
|
else{
|
|
|
|
$query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
|
|
|
|
}
|
|
|
|
$query->where('gl_project.extend_type', '!=' ,5);
|
|
|
|
}
|
|
|
|
if(isset($this->map['uptime']) && is_array($this->map['uptime'])){
|
|
|
|
$query->whereBetween('gl_project.uptime', $this->map['uptime']);
|
...
|
...
|
|