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

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>917]);
+        $list = $projectModel->list(['id'=>206]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -264,6 +264,9 @@ class ProjectController extends BaseController
         if(isset($this->map['tech_mid'])){
         if(isset($this->map['tech_mid'])){
             $query = $query->where('gl_project_deploy_optimize.tech_mid',$this->map['tech_mid']);
             $query = $query->where('gl_project_deploy_optimize.tech_mid',$this->map['tech_mid']);
         }
         }
+        if(isset($this->map['optimist_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.optimist_mid',$this->map['optimist_mid']);
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -472,23 +472,26 @@ class RankDataLogic extends BaseLogic
         }
         }
 
 
         //关键词达标天数
         //关键词达标天数
-        if($model->updated_date != date('Y-m-d') || empty($model->is_compliance)){
         //保证关键词数
         //保证关键词数
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $type = Project::where('id', $project_id)->value('type');
         $type = Project::where('id', $project_id)->value('type');
-            if($keyword_num && $type == Project::TYPE_TWO && $first_page_num >= $keyword_num){
-                Log::channel('rank_data')->info('项目'.$project_id.':关键词达标-'.$first_page_num);
-                $model->compliance_day = $model->compliance_day + 1;
-                $model->is_compliance = 1;
+        $model->is_compliance = 0;
+        if ($keyword_num && $type == Project::TYPE_TWO && $first_page_num >= $keyword_num) {
+            Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num);
+
             //项目表更新
             //项目表更新
-                if(!$lang){
+            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;
                 $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]);
-                }
-            }else{
-                Log::channel('rank_data')->info('项目'.$project_id.':关键词未达标-'.$first_page_num);
+                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));
             }
             }
+
+            $model->compliance_day = $model->compliance_day + 1;
+            $model->is_compliance = 1;
+        } else {
+            Log::channel('rank_data')->info('项目' . $project_id . ':关键词未达标'. $keyword_num .' - ' . $first_page_num);
         }
         }
+
         $model->project_id = $project_id;
         $model->project_id = $project_id;
         $model->first_num = $first_num;
         $model->first_num = $first_num;
         $model->first_page_num = $first_page_num;
         $model->first_page_num = $first_page_num;