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

@@ -211,6 +211,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
+        if(isset($this->map['amp_status'])){
+            $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);
+        }
         if(isset($this->map['level']) && !empty($this->map['level'])){
         if(isset($this->map['level']) && !empty($this->map['level'])){
             $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]);
             $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]);
         }
         }

@@ -98,9 +98,12 @@ class ProjectLogic extends BaseLogic
         //升级项目采集完成时间
         //升级项目采集完成时间
         $collect_time = '';
         $collect_time = '';
         if($info['is_upgrade'] == 1){
         if($info['is_upgrade'] == 1){
-            $collect_info = UpdateLog::where('project_id',$id)->where('api_type','blog')->first();
-            if($collect_info){
-                $collect_time = $collect_info->collect_status == 0 ? '采集中' : $collect_info->updated_at->format('Y-m-d H:i:s');
+            $collect_un_count = UpdateLog::where('project_id',$id)->where('collect_status',0)->count();
+            if($collect_un_count > 0){
+                $collect_time =  '采集中';
+            }else{
+                $collect_info = UpdateLog::where('project_id',$id)->orderBy('updated_at','desc')->first();
+                $collect_time = $collect_info->updated_at->format('Y-m-d H:i:s');
             }
             }
         }
         }
         $info['collect_time'] = $collect_time;
         $info['collect_time'] = $collect_time;