作者 刘锟

update

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