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

Master server



查看合并请求 !1294

@@ -54,7 +54,7 @@ class WeekProject extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['delete_status'=>0,'main_lang_id'=>['in',[8]],'type'=>['in',[1,2,3,4,6]]],'id',['id','title','is_weekly_report','main_lang_id']);
+        $list = $projectModel->list(['delete_status'=>0,'main_lang_id'=>['in',[2]],'type'=>['in',[1,2,3,4,6]]],'id',['id','title','is_weekly_report','main_lang_id']);
         $domainModel = new DomainInfo();
         $domainModel = new DomainInfo();
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -136,9 +136,9 @@ class WeekProject extends Command
             $data['daily_average_num'] = round($pv_num_count / 7,2);
             $data['daily_average_num'] = round($pv_num_count / 7,2);
         }
         }
 
 
-//        if($value['is_weekly_report'] != 0){
+        if($value['is_weekly_report'] != 0){
             $this->workChatMessage($data,$value['id']);
             $this->workChatMessage($data,$value['id']);
-//        }
+        }
         $v6WeeklyReportModel = new V6WeeklyReport();
         $v6WeeklyReportModel = new V6WeeklyReport();
         $v6WeeklyReportModel->add($data);
         $v6WeeklyReportModel->add($data);
         return true;
         return true;