正在显示
1 个修改的文件
包含
5 行增加
和
5 行删除
| @@ -61,15 +61,15 @@ class AfterDayCount extends Command | @@ -61,15 +61,15 @@ class AfterDayCount extends Command | ||
| 61 | $this->managerHrModel = new ManageHr(); | 61 | $this->managerHrModel = new ManageHr(); |
| 62 | $projectModel = new Project(); | 62 | $projectModel = new Project(); |
| 63 | $rankDataLogModel = new RankDataLog(); | 63 | $rankDataLogModel = new RankDataLog(); |
| 64 | - $todayMidnight = date('Y-m-d', strtotime('today')); | 64 | + $date = date('Y-m-d'); |
| 65 | $saveData = []; | 65 | $saveData = []; |
| 66 | - $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id | 66 | +// $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id |
| 67 | foreach ($this->after_manager as $key => $valM){ | 67 | foreach ($this->after_manager as $key => $valM){ |
| 68 | $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id'); | 68 | $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id'); |
| 69 | $project_count = $projectModel->where('gl_project.extend_type',0) | 69 | $project_count = $projectModel->where('gl_project.extend_type',0) |
| 70 | ->where('gl_project.delete_status',0) | 70 | ->where('gl_project.delete_status',0) |
| 71 | ->where('gl_project.old_project_id',0) | 71 | ->where('gl_project.old_project_id',0) |
| 72 | - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) | 72 | + ->where('gl_project_deploy_optimize.start_date','<=',$date) |
| 73 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 73 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 74 | ->whereIn('gl_project.type',[2,4,6]) | 74 | ->whereIn('gl_project.type',[2,4,6]) |
| 75 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') | 75 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') |
| @@ -79,7 +79,7 @@ class AfterDayCount extends Command | @@ -79,7 +79,7 @@ class AfterDayCount extends Command | ||
| 79 | $qualified_count = $projectModel->where('gl_project.extend_type',0) | 79 | $qualified_count = $projectModel->where('gl_project.extend_type',0) |
| 80 | ->where('gl_project.delete_status',0) | 80 | ->where('gl_project.delete_status',0) |
| 81 | ->where('gl_project.old_project_id',0) | 81 | ->where('gl_project.old_project_id',0) |
| 82 | - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) | 82 | + ->where('gl_project_deploy_optimize.start_date','<=',$date) |
| 83 | ->where('gl_project.is_remain_today',1) | 83 | ->where('gl_project.is_remain_today',1) |
| 84 | ->where('gl_project_deploy_build.plan','!=',0) | 84 | ->where('gl_project_deploy_build.plan','!=',0) |
| 85 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 85 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| @@ -123,7 +123,7 @@ class AfterDayCount extends Command | @@ -123,7 +123,7 @@ class AfterDayCount extends Command | ||
| 123 | } | 123 | } |
| 124 | $data = $projectModel->where('gl_project.extend_type',0) | 124 | $data = $projectModel->where('gl_project.extend_type',0) |
| 125 | ->where('gl_project.delete_status',0) | 125 | ->where('gl_project.delete_status',0) |
| 126 | - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) | 126 | + ->where('gl_project_deploy_optimize.start_date','<=',$date) |
| 127 | ->where('gl_project.is_remain_today',1) | 127 | ->where('gl_project.is_remain_today',1) |
| 128 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) | 128 | ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) |
| 129 | ->whereIn('gl_project.type',[2,4,6]) | 129 | ->whereIn('gl_project.type',[2,4,6]) |
-
请 注册 或 登录 后发表评论