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

变更数据



查看合并请求 !3079

@@ -29,6 +29,27 @@ class GeoConfirmController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :确认信息详情
+     * @name   :getInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:08
+     */
+    public function getInfo()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+            'type' => 'required|integer',
+        ], [
+            'project_id.required' => '项目ID不能为空',
+            'type.required' => '确定数据类型不能为空',
+            'type.integer' => '确定数据类型不正确',
+        ]);
+        $data = $this->logic->getConfirmInfo();
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
      * 保存确认数据， 并推送微信群
      * 保存确认数据， 并推送微信群
      * @param Request $request
      * @param Request $request
      * @throws \App\Exceptions\AsideGlobalException
      * @throws \App\Exceptions\AsideGlobalException

@@ -462,7 +462,7 @@ class ProjectController extends BaseController
         }
         }
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         //geo项目
         //geo项目
-        if (($item['seo_plan'] != 0)) {
+        if (($item['seo_plan'] != 0) && ($item['seo_plan'] != 9 || $item['plan'] == 0)) {
             //geo项目负责人
             //geo项目负责人
             $geoConfModel = new GeoConf();
             $geoConfModel = new GeoConf();
             $manage_id = $geoConfModel->getValue(['project_id' => $item['id']], 'manager_id');
             $manage_id = $geoConfModel->getValue(['project_id' => $item['id']], 'manager_id');

@@ -57,4 +57,17 @@ class GeoConfirmLogic extends BaseLogic
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }
+
+    /**
+     * @remark :获取数据详情
+     * @name   :getInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:13
+     */
+    public function getConfirmInfo()
+    {
+        $data = $this->model->read($this->param);
+        return $this->success($data);
+    }
 }
 }

@@ -595,6 +595,7 @@ Route::middleware(['aloginauth'])->group(function () {
         //geo客户确认信息
         //geo客户确认信息
         Route::prefix('confirm')->group(function () {
         Route::prefix('confirm')->group(function () {
             Route::any('/saveConfirmContent', [Aside\Geo\GeoConfirmController::class, 'saveConfirmContent'])->name('admin.geo_confirm_saveConfirmContent');
             Route::any('/saveConfirmContent', [Aside\Geo\GeoConfirmController::class, 'saveConfirmContent'])->name('admin.geo_confirm_saveConfirmContent');
+            Route::any('/getInfo', [Aside\Geo\GeoConfirmController::class, 'getInfo'])->name('admin.geo_confirm_getInfo');
         });
         });
         //geoai文章任务管理
         //geoai文章任务管理
         Route::prefix('writing_task')->group(function () {
         Route::prefix('writing_task')->group(function () {