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

修改同步aicc



查看合并请求 !1031

@@ -102,6 +102,7 @@ class ProjectLogic extends BaseLogic
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         //升级项目采集完成时间
         //升级项目采集完成时间
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
+
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -785,7 +786,9 @@ class ProjectLogic extends BaseLogic
     public function saveOtherProject(){
     public function saveOtherProject(){
         //获取当前数据详情
         //获取当前数据详情
         $projectInfo = $this->getProjectInfo($this->param['id']);
         $projectInfo = $this->getProjectInfo($this->param['id']);
-        //aicc if (($projectInfo['aicc'] == Project::TYPE_ZERO) && ($this->param['aicc'] == Project::TYPE_ONE)) 从关闭到开启状态才同步， 改成只要是开启状态就同步
+        if(($projectInfo['created_at'] <= '2014-12-01 00:00:00')){//12月1号过后默认不开启
+            $this->param['aicc'] = Project::TYPE_ZERO;
+        }
         if($this->param['aicc'] == Project::TYPE_ONE && !empty($this->param['exclusive_aicc_day'])){
         if($this->param['aicc'] == Project::TYPE_ONE && !empty($this->param['exclusive_aicc_day'])){
             $data = [
             $data = [
                 'company_name'=>$projectInfo['company'],
                 'company_name'=>$projectInfo['company'],