正在显示
1 个修改的文件
包含
6 行增加
和
6 行删除
| @@ -101,8 +101,8 @@ class AfterDayCount extends Command | @@ -101,8 +101,8 @@ class AfterDayCount extends Command | ||
| 101 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 101 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 102 | ->whereIn('gl_project.type',[2,4,6]) | 102 | ->whereIn('gl_project.type',[2,4,6]) |
| 103 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 103 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 104 | -// ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | ||
| 105 | -// ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | 104 | + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 105 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 106 | ->count(); | 106 | ->count(); |
| 107 | $three_qualified_count = $projectModel->where('gl_project.extend_type',0) | 107 | $three_qualified_count = $projectModel->where('gl_project.extend_type',0) |
| 108 | ->where('gl_project.delete_status',0) | 108 | ->where('gl_project.delete_status',0) |
| @@ -115,8 +115,8 @@ class AfterDayCount extends Command | @@ -115,8 +115,8 @@ class AfterDayCount extends Command | ||
| 115 | ->where('gl_project_deploy_build.plan','!=',0) | 115 | ->where('gl_project_deploy_build.plan','!=',0) |
| 116 | ->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') |
| 117 | ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') | 117 | ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') |
| 118 | -// ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | ||
| 119 | -// ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | 118 | + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 119 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 120 | ->count(); | 120 | ->count(); |
| 121 | if($three_project_count != 0){ | 121 | if($three_project_count != 0){ |
| 122 | $three_rate = number_format($three_qualified_count / $three_project_count, 2); | 122 | $three_rate = number_format($three_qualified_count / $three_project_count, 2); |
| @@ -130,8 +130,8 @@ class AfterDayCount extends Command | @@ -130,8 +130,8 @@ class AfterDayCount extends Command | ||
| 130 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 130 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 131 | ->whereIn('gl_project.type',[2,4,6]) | 131 | ->whereIn('gl_project.type',[2,4,6]) |
| 132 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 132 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| 133 | -// ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") | ||
| 134 | -// ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | 133 | + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") |
| 134 | + ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") | ||
| 135 | ->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray(); | 135 | ->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray(); |
| 136 | $saveData[] = [ | 136 | $saveData[] = [ |
| 137 | 'date'=>date('Y-m-d'), | 137 | 'date'=>date('Y-m-d'), |
-
请 注册 或 登录 后发表评论