|
...
|
...
|
@@ -61,15 +61,15 @@ class AfterDayCount extends Command |
|
|
|
$this->managerHrModel = new ManageHr();
|
|
|
|
$projectModel = new Project();
|
|
|
|
$rankDataLogModel = new RankDataLog();
|
|
|
|
$todayMidnight = date('Y-m-d', strtotime('today'));
|
|
|
|
$date = date('Y-m-d');
|
|
|
|
$saveData = [];
|
|
|
|
$projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
|
|
|
|
// $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
|
|
|
|
foreach ($this->after_manager as $key => $valM){
|
|
|
|
$idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id');
|
|
|
|
$project_count = $projectModel->where('gl_project.extend_type',0)
|
|
|
|
->where('gl_project.delete_status',0)
|
|
|
|
->where('gl_project.old_project_id',0)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$date)
|
|
|
|
->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')
|
|
...
|
...
|
@@ -79,7 +79,7 @@ class AfterDayCount extends Command |
|
|
|
$qualified_count = $projectModel->where('gl_project.extend_type',0)
|
|
|
|
->where('gl_project.delete_status',0)
|
|
|
|
->where('gl_project.old_project_id',0)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$date)
|
|
|
|
->where('gl_project.is_remain_today',1)
|
|
|
|
->where('gl_project_deploy_build.plan','!=',0)
|
|
|
|
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
|
|
...
|
...
|
@@ -123,7 +123,7 @@ class AfterDayCount extends Command |
|
|
|
}
|
|
|
|
$data = $projectModel->where('gl_project.extend_type',0)
|
|
|
|
->where('gl_project.delete_status',0)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
|
|
|
|
->where('gl_project_deploy_optimize.start_date','<=',$date)
|
|
|
|
->where('gl_project.is_remain_today',1)
|
|
|
|
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
|
|
|
|
->whereIn('gl_project.type',[2,4,6])
|
...
|
...
|
|
