gx

@@ -125,7 +125,9 @@ class RemainDay extends Command
                         continue;
                     }
                     $diff = time() - strtotime($opInfo['start_date'] ?? $item['uptime']);
-                    $remain_day = $deploy_build['service_duration'] - floor($diff / (60 * 60 * 24));
+                    $compliance_day = floor($diff / (60 * 60 * 24));
+                    $remain_day = $deploy_build['service_duration'] - $compliance_day;
+
                 }else{
                     $compliance_day  = ($item['finish_remain_day'] ?? 0);
                     $remain_day = $deploy_build['service_duration'] - $compliance_day;
@@ -134,7 +136,8 @@ class RemainDay extends Command
                 //普通建站项目
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
-                    $remain_day = $deploy_build['service_duration'] - floor($diff / (60 * 60 * 24));
+                    $compliance_day = floor($diff / (60 * 60 * 24));
+                    $remain_day = $deploy_build['service_duration'] - $compliance_day;
                 }else{
                     $remain_day = $deploy_build['service_duration'];
                 }
@@ -144,7 +147,7 @@ class RemainDay extends Command
                 $remain_day = 0;
                 $extend_type = Project::TYPE_FIVE;
             }
-            $this->project->edit(['remain_day'=>$remain_day,'extend_type'=>$extend_type],['id'=>$item['id']]);
+            $this->project->edit(['remain_day'=>$remain_day,'extend_type'=>$extend_type,'finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
             echo 'end->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
         }
         return true;

@@ -493,7 +493,8 @@ class RankDataLogic extends BaseLogic
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $compliance_project_ids = [2163,257,823]; //直接达标处理的
-        $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066,2974];//暂停项目id
+        $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066];//暂停的项目
+        $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         //一个项目多个api_no
         $multiple_api_no_project_ids = [
             2104 => [
@@ -568,23 +569,27 @@ class RankDataLogic extends BaseLogic
             //项目表更新
             if (($model->updated_date != date('Y-m-d') || empty($model_is_compliance)) && !$lang) {
                 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
-                if(!in_array($project_id,$ceaseProjectId)){
+                if(!in_array($project_id,$ceaseProjectId)){//不是暂停的项目
                     if($compliance_day == 0){//达标天数为0并当天达标  记录当前达标时间
                         DeployOptimize::where(['project_id'=>$project_id])->update(['first_compliance_time'=>date('Y-m-d')]);
                     }
-                    //多api_no项目 要api_no都分别达标才算
-                    if(in_array($project_id, array_keys($multiple_api_no_project_ids))){
-                        $api_nos = array_keys($multiple_api_no_project_ids[$project_id]);
-                        //今天其他api_no是否都达标了
-                        $count = RankData::where('project_id', $project_id)->whereIn('api_no', $api_nos)->where('api_no', '<>', $api_no)->where('updated_date', date('Y-m-d'))
-                            ->where('is_compliance', 1)->count();
-                        if($count == count($api_nos) - 1){
+                    if(in_array($project_id,$uptimeProjectId)){//直接按上线时间统计的项目
+                        Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
+                    }else{
+                        //多api_no项目 要api_no都分别达标才算
+                        if(in_array($project_id, array_keys($multiple_api_no_project_ids))){
+                            $api_nos = array_keys($multiple_api_no_project_ids[$project_id]);
+                            //今天其他api_no是否都达标了
+                            $count = RankData::where('project_id', $project_id)->whereIn('api_no', $api_nos)->where('api_no', '<>', $api_no)->where('updated_date', date('Y-m-d'))
+                                ->where('is_compliance', 1)->count();
+                            if($count == count($api_nos) - 1){
+                                Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
+                            }
+                        }else{
                             Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
                         }
-                    }else{
-                        Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
+                        Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：' . ($compliance_day + 1));
                     }
-                    Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：' . ($compliance_day + 1));
                 }else{
                     Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day]);
                     Log::channel('rank_data')->info('项目' . $project_id . '暂停项目达标天数不加：'. ($compliance_day));