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

gxai_video视频搜索



查看合并请求 !624

@@ -227,11 +227,10 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_optimize.start_date','>=' ,$this->map['online_updated_at'][0])->where('gl_project_deploy_optimize.start_date','<' ,$this->map['online_updated_at'][1]);
             $query = $query->where('gl_project_deploy_optimize.start_date','>=' ,$this->map['online_updated_at'][0])->where('gl_project_deploy_optimize.start_date','<' ,$this->map['online_updated_at'][1]);
         }
         }
         if(isset($this->map['special'])){
         if(isset($this->map['special'])){
-            if($this->map['special'] == 15){
-                $query = $query->where('gl_project_deploy_optimize.ai_video',1);
-            }else{
-                $query = $query->whereRaw("FIND_IN_SET(?, gl_project_deploy_optimize.special) > 0", [$this->map['special']]);
-            }
+            $query = $query->whereRaw("FIND_IN_SET(?, gl_project_deploy_optimize.special) > 0", [$this->map['special']]);
+        }
+        if(isset($this->map['search'])){
+            $query = $query->where('gl_project_deploy_optimize.ai_video', $this->map['search']);
         }
         }
         if(isset($this->map['is_remain_today'])){
         if(isset($this->map['is_remain_today'])){
             $query = $query->where('gl_project.is_remain_today',$this->map['is_remain_today']);
             $query = $query->where('gl_project.is_remain_today',$this->map['is_remain_today']);

@@ -622,6 +622,7 @@ class ProjectLogic extends BaseLogic
         $data['level'] = $this->model::levelMap();
         $data['level'] = $this->model::levelMap();
         $data['type'] = $this->model::typeMap();
         $data['type'] = $this->model::typeMap();
         $data['special'] = $this->model::specialMap();
         $data['special'] = $this->model::specialMap();
+        $data['search'] = $this->model::searchParam();
         $data['plan'] = $this->model::planMap();
         $data['plan'] = $this->model::planMap();
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -92,6 +92,13 @@ class Project extends Base
         ];
         ];
     }
     }
 
 
+    /**
+     * @remark :优化搜索参数
+     * @name   :specialMap
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/21 16:23
+     */
     public static function specialMap()
     public static function specialMap()
     {
     {
         return [
         return [
@@ -109,10 +116,21 @@ class Project extends Base
             12 => 'AI',
             12 => 'AI',
             13 => 'AI站群',
             13 => 'AI站群',
             14 => '未达标',
             14 => '未达标',
-            15 => 'AI视频'
         ];
         ];
     }
     }
 
 
+    /**
+     * @remark :新增搜索
+     * @name   :searchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/21 16:23
+     */
+    public static function searchParam(){
+        return [
+            1 => 'AI视频',
+        ];
+    }
 
 
     /**
     /**
      * 项目部署服务器信息
      * 项目部署服务器信息