作者 李宇航

合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1759
@@ -62,7 +62,7 @@ class AfterCount extends Command @@ -62,7 +62,7 @@ class AfterCount extends Command
62 $rankDataLogModel = new RankDataLog(); 62 $rankDataLogModel = new RankDataLog();
63 $todayMidnight = date('Y-m-d 00:00:00', strtotime('today')); 63 $todayMidnight = date('Y-m-d 00:00:00', strtotime('today'));
64 $saveData = []; 64 $saveData = [];
65 - $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id 65 + $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>null,'date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
66 foreach ($this->after_manager as $key => $valM){ 66 foreach ($this->after_manager as $key => $valM){
67 $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id'); 67 $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id');
68 $project_count = $projectModel->where('gl_project.extend_type',0) 68 $project_count = $projectModel->where('gl_project.extend_type',0)