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

未续费项目增加搜索



查看合并请求 !2648

@@ -118,7 +118,7 @@ class RemainDay extends Command
      */
      */
     public function seoRemainDay($deploy_build,$item){
     public function seoRemainDay($deploy_build,$item){
         //白帽版本的系统
         //白帽版本的系统
-        if($deploy_build['seo_plan'] == 1){
+        if($deploy_build['seo_plan'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
                 if(in_array($item['id'],$this->bm_projectId) || (in_array( 19,$item['level']))){
                 if(in_array($item['id'],$this->bm_projectId) || (in_array( 19,$item['level']))){
                     $compliance_day = (int)$item['bm_finish_remain_day'];
                     $compliance_day = (int)$item['bm_finish_remain_day'];

@@ -472,7 +472,9 @@ class ProjectLogic extends BaseLogic
         }
         }
         $param['confirm_file'] = Arr::a2s($param['confirm_file'] ?? []);
         $param['confirm_file'] = Arr::a2s($param['confirm_file'] ?? []);
         $remain_day = $param['deploy_build']['service_duration'] - $param['finish_remain_day'];
         $remain_day = $param['deploy_build']['service_duration'] - $param['finish_remain_day'];
+        $seo_remain_day = $param['deploy_build']['service_seo_duration'] - $param['bm_finish_remain_day'];
         $param['remain_day'] = ($remain_day > 0) ? $remain_day : 0;
         $param['remain_day'] = ($remain_day > 0) ? $remain_day : 0;
+        $param['seo_remain_day'] = ($seo_remain_day > 0) ? $seo_remain_day : 0;
         //文件上传默认值
         //文件上传默认值
         if($param['is_upload_manage']){
         if($param['is_upload_manage']){
             $param['upload_config'] = [
             $param['upload_config'] = [