周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 b5f082cbc31d234cece585d5aab069c909055944 1 个父辈 e6838c19

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 6 行增加 和 3 行删除
@@ -329,9 +329,10 @@ class WebTrafficRussia extends Command @@ -329,9 +329,10 @@ class WebTrafficRussia extends Command
329 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id') 329 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id')
330 ->where('pdo.domain', '>', 0) 330 ->where('pdo.domain', '>', 0)
331 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE) 331 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
332 - ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR]) 332 + ->where('gl_project.type', Project::TYPE_TWO)
333 ->where('gl_project.is_upgrade', 0) //非升级项目 333 ->where('gl_project.is_upgrade', 0) //非升级项目
334 ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站 334 ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站
  335 + ->WhereRaw("NOT FIND_IN_SET(2, `level`)") //非暂停优化
335 ->where(function ($query) use ($type) { 336 ->where(function ($query) use ($type) {
336 if($type == 1){ 337 if($type == 1){
337 //1-3个月项目 338 //1-3个月项目
@@ -325,10 +325,11 @@ class WebTrafficRussiaSpecial extends Command @@ -325,10 +325,11 @@ class WebTrafficRussiaSpecial extends Command
325 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id') 325 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id')
326 ->where('pdo.domain', '>', 0) 326 ->where('pdo.domain', '>', 0)
327 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE) 327 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
328 - ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR]) 328 + ->where('gl_project.type', Project::TYPE_TWO)
329 ->where('gl_project.is_upgrade', 0) //非升级项目 329 ->where('gl_project.is_upgrade', 0) //非升级项目
330 ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站 330 ->where('gl_project.main_lang_id', $ru_lang_id)// 俄语站
331 ->whereIn('gl_project.id', array_keys($projects)) 331 ->whereIn('gl_project.id', array_keys($projects))
  332 + ->WhereRaw("NOT FIND_IN_SET(2, `level`)") //非暂停优化
332 ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get(); 333 ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get();
333 //其他地方在引流的域名 334 //其他地方在引流的域名
334 // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); 335 // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
@@ -291,10 +291,11 @@ class WebTrafficSpecial extends Command @@ -291,10 +291,11 @@ class WebTrafficSpecial extends Command
291 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id') 291 ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id')
292 ->where('pdo.domain', '>', 0) 292 ->where('pdo.domain', '>', 0)
293 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE) 293 ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
294 - ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR]) 294 + ->where('gl_project.type', Project::TYPE_TWO)
295 ->where('gl_project.is_upgrade', 0) //非升级项目 295 ->where('gl_project.is_upgrade', 0) //非升级项目
296 ->where('gl_project.main_lang_id', '<>', $ru_lang_id) //非俄语站 296 ->where('gl_project.main_lang_id', '<>', $ru_lang_id) //非俄语站
297 ->whereIn('gl_project.id', array_keys($projects)) 297 ->whereIn('gl_project.id', array_keys($projects))
  298 + ->WhereRaw("NOT FIND_IN_SET(2, `level`)") //非暂停优化
298 ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get(); 299 ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->orderBy('project_id')->get();
299 //其他地方在引流的域名 300 //其他地方在引流的域名
300 // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); 301 // $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();