gx

@@ -22,6 +22,9 @@ class RemainDay extends Command
      */
      */
     protected $signature = 'remain_day';
     protected $signature = 'remain_day';
 
 
+    protected $projectId = [
+        1434
+    ];//需要单独处理的项目
     /**
     /**
      * The console command description.
      * The console command description.
      *
      *
@@ -46,24 +49,21 @@ class RemainDay extends Command
     {
     {
         $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
         $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
         foreach ($list as $item){
         foreach ($list as $item){
-            if($item['type'] == Project::TYPE_TWO){
-                //获取当前项目的达标天数
-                $compliance_day  = Project::where(['id' => $item['id']])->value('finish_remain_day') ?: 0;
-                $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
+            if(in_array($item->id,$this->projectId)){
+                $diff = time() - strtotime($item->uptime);
+                $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
             }else{
             }else{
-                //审核上线后开始
-                $check_time = OnlineCheck::where('project_id', $item['id'])->where('status', 1)->value('created_at') ?: '';
-                if(!$check_time){
+                if($item['type'] == Project::TYPE_TWO){
+                    //获取当前项目的达标天数
+                    $compliance_day  = $item->finish_remain_day ?? 0;
+                    $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
+                }else{
                     if($item->uptime){
                     if($item->uptime){
                         $diff = time() - strtotime($item->uptime);
                         $diff = time() - strtotime($item->uptime);
                         $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                         $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                     }else{
                     }else{
                         $remain_day = $item['deploy_build']['service_duration'];
                         $remain_day = $item['deploy_build']['service_duration'];
                     }
                     }
-                }else{
-                    $diff = time() - strtotime($check_time);
-                    $remain_day = floor($diff / (60 * 60 * 24));
-                    $item->finish_remain_day = $remain_day;
                 }
                 }
             }
             }
             $item->remain_day = $remain_day > 0 ? $remain_day : 0;
             $item->remain_day = $remain_day > 0 ? $remain_day : 0;