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

数据统计



查看合并请求 !1865

@@ -79,9 +79,11 @@ class AfterDayCount extends Command
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.created_at','<=',$todayMidnight)
                 ->where('gl_project.is_remain_today',1)
+                ->where('gl_project_deploy_build.plan','!=',0)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
                 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+                ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
                 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
                 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
                 ->count();
@@ -102,7 +104,9 @@ class AfterDayCount extends Command
                 ->where('gl_project.created_at','<=',$threeMonthsAgo)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
+                ->where('gl_project_deploy_build.plan','!=',0)
                 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+                ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
                 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
                 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
                 ->count();