正在显示
1 个修改的文件
包含
5 行增加
和
0 行删除
| @@ -73,6 +73,7 @@ class AfterDayCount extends Command | @@ -73,6 +73,7 @@ class AfterDayCount extends Command | ||
| 73 | ->whereIn('gl_project.type',[2,4]) | 73 | ->whereIn('gl_project.type',[2,4]) |
| 74 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 74 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 75 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | 75 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 76 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 76 | ->count(); | 77 | ->count(); |
| 77 | $qualified_count = $projectModel->where('gl_project.extend_type',0) | 78 | $qualified_count = $projectModel->where('gl_project.extend_type',0) |
| 78 | ->where('gl_project.delete_status',0) | 79 | ->where('gl_project.delete_status',0) |
| @@ -82,6 +83,7 @@ class AfterDayCount extends Command | @@ -82,6 +83,7 @@ class AfterDayCount extends Command | ||
| 82 | ->whereIn('gl_project.type',[2,4]) | 83 | ->whereIn('gl_project.type',[2,4]) |
| 83 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 84 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 84 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | 85 | ->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") | ||
| 85 | ->count(); | 87 | ->count(); |
| 86 | $rate = number_format($qualified_count / $project_count, 2); | 88 | $rate = number_format($qualified_count / $project_count, 2); |
| 87 | $threeMonthsAgo = date('Y-m-d 00:00:00', strtotime('-3 months')); | 89 | $threeMonthsAgo = date('Y-m-d 00:00:00', strtotime('-3 months')); |
| @@ -92,6 +94,7 @@ class AfterDayCount extends Command | @@ -92,6 +94,7 @@ class AfterDayCount extends Command | ||
| 92 | ->whereIn('gl_project.type',[2,4]) | 94 | ->whereIn('gl_project.type',[2,4]) |
| 93 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 95 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 94 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | 96 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 97 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 95 | ->count(); | 98 | ->count(); |
| 96 | $three_qualified_count = $projectModel->where('gl_project.extend_type',0) | 99 | $three_qualified_count = $projectModel->where('gl_project.extend_type',0) |
| 97 | ->whereIn('gl_project.id',$projectIdArr) | 100 | ->whereIn('gl_project.id',$projectIdArr) |
| @@ -101,6 +104,7 @@ class AfterDayCount extends Command | @@ -101,6 +104,7 @@ class AfterDayCount extends Command | ||
| 101 | ->whereIn('gl_project.type',[2,4]) | 104 | ->whereIn('gl_project.type',[2,4]) |
| 102 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 105 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 103 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | 106 | ->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") | ||
| 104 | ->count(); | 108 | ->count(); |
| 105 | $three_rate = number_format($three_qualified_count / $three_project_count, 2); | 109 | $three_rate = number_format($three_qualified_count / $three_project_count, 2); |
| 106 | $data = $projectModel->where('gl_project.extend_type',0) | 110 | $data = $projectModel->where('gl_project.extend_type',0) |
| @@ -111,6 +115,7 @@ class AfterDayCount extends Command | @@ -111,6 +115,7 @@ class AfterDayCount extends Command | ||
| 111 | ->whereIn('gl_project.type',[2,4]) | 115 | ->whereIn('gl_project.type',[2,4]) |
| 112 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 116 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 113 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | 117 | ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 118 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 114 | ->pluck('gl_project.title')->toArray(); | 119 | ->pluck('gl_project.title')->toArray(); |
| 115 | $saveData[] = [ | 120 | $saveData[] = [ |
| 116 | 'date'=>date('Y-m-d', strtotime('yesterday')), | 121 | 'date'=>date('Y-m-d', strtotime('yesterday')), |
-
请 注册 或 登录 后发表评论