gx

@@ -57,7 +57,9 @@ class RemainDay extends Command
         foreach ($list as $item){
         foreach ($list as $item){
             if($item['type'] == Project::TYPE_TWO){
             if($item['type'] == Project::TYPE_TWO){
                 //排名达标天数
                 //排名达标天数
-                $compliance_day = GoogleRankModel::where(['project_id' => $item['id'], 'lang' => ''])->value('compliance_day') ?: 0;
+//                $compliance_day = GoogleRankModel::where(['project_id' => $item['id'], 'lang' => ''])->value('compliance_day') ?: 0;
+                //获取当前项目的达标天数
+                $compliance_day  = Project::where(['id' => $item['id']])->value('finish_remain_day') ?: 0;
                 $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
                 $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
             }else{
             }else{
                 //审核上线后开始
                 //审核上线后开始

@@ -184,6 +184,8 @@ class ProjectLogic extends BaseLogic
             }
             }
             $param['confirm_file'] = Arr::a2s($param['confirm_file']);
             $param['confirm_file'] = Arr::a2s($param['confirm_file']);
         }
         }
+        //剩余服务天数
+        $param['remain_day'] = $param['deploy_build']['service_duration'] - $param['finish_remain_day'];
         unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],$param['online_check'],$param['project_after']);
         unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],$param['online_check'],$param['project_after']);
         //文件上传默认值
         //文件上传默认值
         if($param['is_upload_manage']){
         if($param['is_upload_manage']){

@@ -464,9 +464,9 @@ class RankDataLogic extends BaseLogic
             if($keyword_num && $type == Project::TYPE_TWO && $first_page_num >= $keyword_num){
             if($keyword_num && $type == Project::TYPE_TWO && $first_page_num >= $keyword_num){
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->is_compliance = 1;
                 $model->is_compliance = 1;
-
                 //项目表更新
                 //项目表更新
-                Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $model->compliance_day]);
+                $compliance_day  = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
+                Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day+1]);
             }
             }
         }
         }