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

Lyh server



查看合并请求 !2126

@@ -961,14 +961,10 @@ class ProjectController extends BaseController
             'id'=>'required',
             'id'=>'required',
             'aicc'=>'required',
             'aicc'=>'required',
             'hagro'=>'required',
             'hagro'=>'required',
-//            'exclusive_aicc_day'=>'required',
-//            'exclusive_hagro_day'=>'required',
         ],[
         ],[
             'id.required' => 'id不能为空',
             'id.required' => 'id不能为空',
             'aicc.required' => 'aicc是否开启不能为空',
             'aicc.required' => 'aicc是否开启不能为空',
             'hagro.required' => 'hagro是否开启不能为空',
             'hagro.required' => 'hagro是否开启不能为空',
-//            'exclusive_aicc_day.required' => '服务天数不能为空',
-//            'exclusive_hagro_day.required' => '服务天数不能为空',
         ]);
         ]);
         $logic->saveOtherProject();
         $logic->saveOtherProject();
         $this->response('success');
         $this->response('success');

@@ -101,6 +101,7 @@ class RankDataLogic extends BaseLogic
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'remain_day' => $project['remain_day'],
             'remain_day' => $project['remain_day'],
+            'seo_remain_day' => $project['seo_remain_day'],
             'g_top_plan' => $g_top_plan ?? [],
             'g_top_plan' => $g_top_plan ?? [],
         ];
         ];
         //小语种列表
         //小语种列表

@@ -14,7 +14,7 @@ class NoticeLog extends Base
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_INIT_PROJECT = 'init_project';
     const TYPE_INIT_PROJECT = 'init_project';
     const TYPE_INIT_KEYWORD_COMMON = 'init_keyword_common';//聚合页关键词评论
     const TYPE_INIT_KEYWORD_COMMON = 'init_keyword_common';//聚合页关键词评论
-    const TYPE_GENERATE_COUNT_CHARTS = 'generate_count_charts';//聚合页关键字图片生成
+    const TYPE_GENERATE_COUNT_CHARTS = 'generate_count_charts';//聚合页关键字图表生成
     const TYPE_COPY_PROJECT = 'copy_project';
     const TYPE_COPY_PROJECT = 'copy_project';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';