|
...
|
...
|
@@ -101,8 +101,8 @@ class AfterDayCount extends Command |
|
|
|
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
|
|
|
|
->whereIn('gl_project.type',[2,4,6])
|
|
|
|
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.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")
|
|
|
|
->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();
|
|
|
|
$three_qualified_count = $projectModel->where('gl_project.extend_type',0)
|
|
|
|
->where('gl_project.delete_status',0)
|
|
...
|
...
|
@@ -115,8 +115,8 @@ class AfterDayCount extends Command |
|
|
|
->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")
|
|
|
|
->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();
|
|
|
|
if($three_project_count != 0){
|
|
|
|
$three_rate = number_format($three_qualified_count / $three_project_count, 2);
|
|
...
|
...
|
@@ -130,8 +130,8 @@ class AfterDayCount extends Command |
|
|
|
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
|
|
|
|
->whereIn('gl_project.type',[2,4,6])
|
|
|
|
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.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")
|
|
|
|
->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")
|
|
|
|
->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray();
|
|
|
|
$saveData[] = [
|
|
|
|
'date'=>date('Y-m-d'),
|
...
|
...
|
|
