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

变更数据



查看合并请求 !3018

@@ -23,8 +23,8 @@ use Illuminate\Http\Request;
  */
  */
 class GeoConfirmController extends BaseController
 class GeoConfirmController extends BaseController
 {
 {
-    public function __construct(){
-        parent::__construct();
+    public function __construct(Request $request){
+        parent::__construct($request);
         $this->logic = new GeoConfirmLogic();
         $this->logic = new GeoConfirmLogic();
     }
     }
 
 

@@ -9,7 +9,11 @@
 
 
 namespace App\Http\Controllers\Aside\Geo;
 namespace App\Http\Controllers\Aside\Geo;
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Geo\GeoWritingsTaskLogic;
+use App\Http\Requests\Aside\Geo\GeoWritingsTaskRequest;
+use Illuminate\Http\Request;
 
 
 /**
 /**
  * @remark :文章任务（收集数据）
  * @remark :文章任务（收集数据）
@@ -20,6 +24,12 @@ use App\Http\Controllers\Aside\BaseController;
  */
  */
 class GeoWritingTaskController extends BaseController
 class GeoWritingTaskController extends BaseController
 {
 {
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new GeoWritingsTaskLogic();
+    }
+
     /**
     /**
      * @remark :保存geoAi文章数据
      * @remark :保存geoAi文章数据
      * @name   :lists
      * @name   :lists
@@ -28,6 +38,9 @@ class GeoWritingTaskController extends BaseController
      * @time   :2025/10/25 10:41
      * @time   :2025/10/25 10:41
      */
      */
     public function saveWritingTask(){
     public function saveWritingTask(){
-
+        $request = new GeoWritingsTaskRequest();
+        $request->validated();
+        $data = $this->logic->saveWritingTask($this->param);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -160,7 +160,7 @@ class OptimizeController extends BaseController
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         $plan = Project::planMap();
         $plan = Project::planMap();
         $seo_plan = Project::seoMap();
         $seo_plan = Project::seoMap();
-        $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
+        $item['plan'] = $plan[$item['plan']] ?? ($seo_plan[$item['seo_plan']] ?? '');
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);

@@ -21,4 +21,15 @@ class GeoWritingsTaskLogic extends BaseLogic
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
         $this->model = new GeoWritingsTask();
         $this->model = new GeoWritingsTask();
     }
     }
+
+    /**
+     * @remark :数据
+     * @name   :saveWritingTask
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/25 14:41
+     */
+    public function saveWritingTask(){
+
+    }
 }
 }