合并分支 'lyh-server' 到 'master'

更新项目白帽系统剩余服务时常



查看合并请求 !2419

@@ -121,6 +121,7 @@ class RemainDay extends Command
         if($deploy_build['seo_plan'] == 1){
         if($deploy_build['seo_plan'] == 1){
             if($deploy_build['seo_service_duration'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
                 if(in_array($item['id'],$this->bm_projectId)){
                 if(in_array($item['id'],$this->bm_projectId)){
+                    $compliance_day = (int)$item['bm_finish_remain_day'];
                     $seo_remain_day = $deploy_build['seo_service_duration'] - (int)$item['bm_finish_remain_day'];
                     $seo_remain_day = $deploy_build['seo_service_duration'] - (int)$item['bm_finish_remain_day'];
                 }else{
                 }else{
                     //按自然日统计
                     //按自然日统计
@@ -133,7 +134,7 @@ class RemainDay extends Command
                     $this->project->edit(['seo_remain_day'=>$seo_remain_day,'bm_finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
                     $this->project->edit(['seo_remain_day'=>$seo_remain_day,'bm_finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
                 }else{
                 }else{
                     //同时包括白帽版本+默认版本的项目
                     //同时包括白帽版本+默认版本的项目
-                    $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
+                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'bm_finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
                 }
                 }
             }
             }
         }
         }

@@ -90,7 +90,6 @@ class GeoQuestionResLogic extends BaseLogic
             $keywordsTotalCount += count($item['keywords'] ?? []);
             $keywordsTotalCount += count($item['keywords'] ?? []);
             $urlTotalCount += count($item['url'] ?? []);
             $urlTotalCount += count($item['url'] ?? []);
         }
         }
-        $keywordUrlCount = 0;
         $keywordArr = [];
         $keywordArr = [];
         $questionResModel = new GeoQuestionLog();
         $questionResModel = new GeoQuestionLog();
         $resList = $questionResModel->list(['project_id'=>$this->user['project_id']],['keywords','url','keywords_num','url_num']);
         $resList = $questionResModel->list(['project_id'=>$this->user['project_id']],['keywords','url','keywords_num','url_num']);