周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 896cf38b17e0e326f79ec9fbf82c4c20e24dc866 2 个父辈 4fc5fdfd cc580391

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

数据统计



查看合并请求 !1865
内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 0 行删除
@@ -79,9 +79,11 @@ class AfterDayCount extends Command @@ -79,9 +79,11 @@ class AfterDayCount extends Command
79 ->where('gl_project.delete_status',0) 79 ->where('gl_project.delete_status',0)
80 ->where('gl_project.created_at','<=',$todayMidnight) 80 ->where('gl_project.created_at','<=',$todayMidnight)
81 ->where('gl_project.is_remain_today',1) 81 ->where('gl_project.is_remain_today',1)
  82 + ->where('gl_project_deploy_build.plan','!=',0)
82 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 83 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
83 ->whereIn('gl_project.type',[2,4]) 84 ->whereIn('gl_project.type',[2,4])
84 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 85 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  86 + ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
85 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 87 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
86 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 88 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
87 ->count(); 89 ->count();
@@ -102,7 +104,9 @@ class AfterDayCount extends Command @@ -102,7 +104,9 @@ class AfterDayCount extends Command
102 ->where('gl_project.created_at','<=',$threeMonthsAgo) 104 ->where('gl_project.created_at','<=',$threeMonthsAgo)
103 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 105 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
104 ->whereIn('gl_project.type',[2,4]) 106 ->whereIn('gl_project.type',[2,4])
  107 + ->where('gl_project_deploy_build.plan','!=',0)
105 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 108 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  109 + ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
106 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 110 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
107 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 111 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
108 ->count(); 112 ->count();