正在显示
1 个修改的文件
包含
5 行增加
和
5 行删除
| @@ -90,12 +90,12 @@ class AfterDayCount extends Command | @@ -90,12 +90,12 @@ class AfterDayCount extends Command | ||
| 90 | ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | 90 | ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") |
| 91 | ->count(); | 91 | ->count(); |
| 92 | $rate = number_format($qualified_count / $project_count, 2); | 92 | $rate = number_format($qualified_count / $project_count, 2); |
| 93 | - $threeMonthsAgo = date('Y-m-d', strtotime('-3 months')); | 93 | + $threeMonthsAgo = date('Y-m', strtotime('-3 months')); |
| 94 | $three_project_count = $projectModel->where('gl_project.extend_type',0) | 94 | $three_project_count = $projectModel->where('gl_project.extend_type',0) |
| 95 | ->where('gl_project.delete_status',0) | 95 | ->where('gl_project.delete_status',0) |
| 96 | ->where('gl_project.old_project_id',0) | 96 | ->where('gl_project.old_project_id',0) |
| 97 | - ->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00') | ||
| 98 | - ->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59') | 97 | + ->where('gl_project.created_at','>=',$threeMonthsAgo.'-01 00:00:00') |
| 98 | + ->where('gl_project.created_at','<=',$threeMonthsAgo.'-31 23:59:59') | ||
| 99 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 99 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 100 | ->whereIn('gl_project.type',[2,4]) | 100 | ->whereIn('gl_project.type',[2,4]) |
| 101 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 101 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| @@ -106,8 +106,8 @@ class AfterDayCount extends Command | @@ -106,8 +106,8 @@ class AfterDayCount extends Command | ||
| 106 | ->whereIn('gl_project.id',$projectIdArr) | 106 | ->whereIn('gl_project.id',$projectIdArr) |
| 107 | ->where('gl_project.delete_status',0) | 107 | ->where('gl_project.delete_status',0) |
| 108 | ->where('gl_project.old_project_id',0) | 108 | ->where('gl_project.old_project_id',0) |
| 109 | - ->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00') | ||
| 110 | - ->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59') | 109 | + ->where('gl_project.created_at','>=',$threeMonthsAgo.'-01 00:00:00') |
| 110 | + ->where('gl_project.created_at','<=',$threeMonthsAgo.'-31 23:59:59') | ||
| 111 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 111 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 112 | ->whereIn('gl_project.type',[2,4]) | 112 | ->whereIn('gl_project.type',[2,4]) |
| 113 | ->where('gl_project_deploy_build.plan','!=',0) | 113 | ->where('gl_project_deploy_build.plan','!=',0) |
-
请 注册 或 登录 后发表评论