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

gx数据



查看合并请求 !1455

@@ -90,7 +90,7 @@ class CopyProject extends Command
         $data['finish_remain_day'] = 0;
         $data['finish_remain_day'] = 0;
         $data['title'] = $data['title'].'-copy';
         $data['title'] = $data['title'].'-copy';
         $data['delete_status'] = 1;
         $data['delete_status'] = 1;
-        unset($data['id'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
+        unset($data['id'],$data['exclusive_aicc_day'],$data['aicc'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
         $project_id = $projectModel->insertGetId($data);
         $project_id = $projectModel->insertGetId($data);
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
         $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
         $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);

@@ -200,7 +200,7 @@ class SyncProject extends Command
                 'requirement' => $param['remark'],
                 'requirement' => $param['remark'],
                 'cooperate_date' => date('Y-m-d', $param['create_time']),
                 'cooperate_date' => date('Y-m-d', $param['create_time']),
                 'from_order_id' => $param['from_order_id'],
                 'from_order_id' => $param['from_order_id'],
-                'aicc' => $param['exclusive_aicc'],
+                'aicc' => ($param['exclusive_aicc'] = 0),
                 "exclusive_aicc_day" => $param['exclusive_aicc_day'],
                 "exclusive_aicc_day" => $param['exclusive_aicc_day'],
                 'hagro' => $param['exclusive_hagro'],
                 'hagro' => $param['exclusive_hagro'],
                 "exclusive_hagro_day" => $param['exclusive_hagro_day'],
                 "exclusive_hagro_day" => $param['exclusive_hagro_day'],

@@ -11,13 +11,7 @@ class DeployOptimize extends Base
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_project_deploy_optimize';
     protected $table = 'gl_project_deploy_optimize';
 
 
-//    public function setMinorLanguagesAttribute($value){
-//        $this->attributes['minor_languages'] = Arr::a2s($value);
-//    }
-//
-//    public function getMinorLanguagesAttribute($value){
-//        return Arr::s2a($value);
-//    }
+
     public function getGTopPlanAttribute($value){
     public function getGTopPlanAttribute($value){
         return Arr::s2a($value);
         return Arr::s2a($value);
     }
     }