Merge remote-tracking branch 'origin/master' into akun

@@ -105,7 +105,7 @@ class RemainDay extends Command
             }
             }
             //todo::优化项目中途达标计时切换为按天计时
             //todo::优化项目中途达标计时切换为按天计时
             if(in_array($item['id'],$this->projectSwitchId)){
             if(in_array($item['id'],$this->projectSwitchId)){
-                $this->project->edit(['remain_day'=>$item['remain_day'] - 1,'finish_remain_day'=>$item['finish_remain_day'] + 1],['id'=>$item['id']]);
+                $this->project->edit(['remain_day'=>($item['remain_day'] - 1),'finish_remain_day'=>($item['finish_remain_day'] + 1)],['id'=>$item['id']]);
                 continue;
                 continue;
             }
             }
             //白帽版本单独计算
             //白帽版本单独计算

@@ -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['plan'] == 0) && ($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');

@@ -236,8 +236,11 @@ class CNoticeController extends BaseController
         if(!$project_info){
         if(!$project_info){
             $this->fail('未查询到项目数据');
             $this->fail('未查询到项目数据');
         }
         }
+        $project_ids = [
+            4041,4094,3514
+        ];
         // --------------------------------------------------- 特殊处理通知生成页面 --------------------------------------------------------------
         // --------------------------------------------------- 特殊处理通知生成页面 --------------------------------------------------------------
-        if ($type == 2 && ($project_id != 4041) && ($project_id != 4094) && ($project_info['main_lang_id'] == 8)) {
+        if ($type == 2 && !in_array($project_id,$project_ids) && ($project_info['main_lang_id'] == 8)) {
             $this->fail('申请项目主语种为俄语，禁止翻译小语种，如若需要翻译小语种， 请联系售后人员确认！');
             $this->fail('申请项目主语种为俄语，禁止翻译小语种，如若需要翻译小语种， 请联系售后人员确认！');
         }
         }
 
 

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\SettingFaqLogic;
 use App\Http\Logic\Bside\Setting\SettingFaqLogic;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 class SettingFaqController extends BaseController
 class SettingFaqController extends BaseController
@@ -24,6 +25,18 @@ class SettingFaqController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取所有路由
+     * @name   :getRouteList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:35
+     */
+    public function getRouteList(){
+        $data = $this->logic->getRouteList();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
      * @remark :faq列表页数据
      * @remark :faq列表页数据
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
@@ -35,4 +48,58 @@ class SettingFaqController extends BaseController
        $lists = $this->logic->getFaqLists($this->map,$this->page,$this->row,$this->order);
        $lists = $this->logic->getFaqLists($this->map,$this->page,$this->row,$this->order);
        $this->response('success',Code::SUCCESS,$lists);
        $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
+    /**
+     * @remark :获取详情
+     * @name   :getInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:28
+     */
+    public function getInfo()
+    {
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $data = $this->logic->getFaqInfo();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存faq数据
+     * @name   :saveFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:21
+     */
+    public function saveFaq()
+    {
+        $this->request->validate([
+            'route'=>'required',
+        ],[
+            'route.required' => '路由不能为空',
+        ]);
+        $data = $this->logic->saveFaq();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :删除对应数据
+     * @name   :deleteFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:23
+     */
+    public function deleteFaq(){
+        $this->request->validate([
+            'id'=>'required|array',
+        ],[
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
+        ]);
+        $data = $this->logic->deleteFaq();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -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);
+    }
 }
 }

@@ -242,6 +242,7 @@ class TicketUploadDataLogic extends BaseLogic
             'name' => $info['text']['title'],
             'name' => $info['text']['title'],
             'image'=>$info['text']['image'],
             'image'=>$info['text']['image'],
             'text'=>$info['text']['remark'],
             'text'=>$info['text']['remark'],
+            'remark'=>$info['text']['intro'] ?? '',
             'category_id'=>$category_id ?? '',
             'category_id'=>$category_id ?? '',
             'status'=>1,
             'status'=>1,
         ];
         ];
@@ -276,6 +277,7 @@ class TicketUploadDataLogic extends BaseLogic
             'name' => $info['text']['title'],
             'name' => $info['text']['title'],
             'image'=>$info['text']['image'],
             'image'=>$info['text']['image'],
             'text'=>$info['text']['remark'],
             'text'=>$info['text']['remark'],
+            'remark'=>$info['text']['intro'] ?? '',
             'category_id'=>$category_id ?? '',
             'category_id'=>$category_id ?? '',
             'status'=>1,
             'status'=>1,
         ];
         ];

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Bside\Setting;
 namespace App\Http\Logic\Bside\Setting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\RouteMap\RouteMap;
 use App\Models\WebSetting\SettingFaq;
 use App\Models\WebSetting\SettingFaq;
 
 
 class SettingFaqLogic extends BaseLogic
 class SettingFaqLogic extends BaseLogic
@@ -22,6 +23,20 @@ class SettingFaqLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取数据
+     * @name   :getRouteList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:36
+     */
+    public function getRouteList($map = [])
+    {
+        $routeModel = new RouteMap();
+        $list = $routeModel->list($map,'id',['*'],'desc',20);
+        return $this->success($list);
+    }
+
+    /**
      * @remark :获取列表页数据
      * @remark :获取列表页数据
      * @name   :getFaqLists
      * @name   :getFaqLists
      * @author :lyh
      * @author :lyh
@@ -35,6 +50,18 @@ class SettingFaqLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取详情数据
+     * @name   :getFaqById
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:29
+     */
+    public function getFaqInfo(){
+        $data = $this->model->read($this->param);
+        return $this->success($data);
+    }
+
+    /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :saveFaq
      * @name   :saveFaq
      * @author :lyh
      * @author :lyh
@@ -43,7 +70,15 @@ class SettingFaqLogic extends BaseLogic
      */
      */
     public function saveFaq()
     public function saveFaq()
     {
     {
-
+        //todo::根据路由获取对应数据详情
+        $routeModel = new RouteMap();
+        $routeInfo = $routeModel->read(['route'=>$this->param['route']],['source','source_id']);
+        if($routeInfo === false){
+            $this->fail('路由不存在');
+        }
+        $this->param['qa'] = json_encode($this->param['qa'],true);
+        $this->param['source'] = $routeInfo['source'];
+        $this->param['source_id'] = $routeInfo['source_id'];
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);
@@ -52,4 +87,16 @@ class SettingFaqLogic extends BaseLogic
         }
         }
         return $this->success(['id' => $id]);
         return $this->success(['id' => $id]);
     }
     }
+
+    /**
+     * @remark :删除数据
+     * @name   :deleteFaq
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/29 17:27
+     */
+    public function deleteFaq(){
+        $this->model->del(['id'=>['in',$this->param['id']]]);
+        return $this->success();
+    }
 }
 }

@@ -9,9 +9,19 @@
 
 
 namespace App\Models\WebSetting;
 namespace App\Models\WebSetting;
 
 
+use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 
 
 class SettingFaq extends Base
 class SettingFaq extends Base
 {
 {
     protected $table = 'gl_setting_faq';
     protected $table = 'gl_setting_faq';
+
+    //连接数据库
+    protected $connection = 'custom_mysql';
+
+    public function getQaAttribute($value)
+    {
+        $value = Arr::s2a($value);
+        return $value;
+    }
 }
 }

@@ -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 () {

@@ -768,6 +768,15 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getSearchDate', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getSearchDate'])->name('geo_result_getSearchDate');//搜索记录时间
         Route::any('/getPlatformCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getPlatformCount'])->name('geo_result_getPlatformCount');//搜索记录时间
         Route::any('/getPlatformCount', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getPlatformCount'])->name('geo_result_getPlatformCount');//搜索记录时间
     });
     });
+
+    //faq渲染数据
+    Route::prefix('faq')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'lists'])->name('faq_lists');
+        Route::any('/getRouteList', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getRouteList'])->name('faq_getRouteList');
+        Route::any('/saveFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'saveFaq'])->name('faq_saveFaq');
+        Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
+        Route::any('/getInfo', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getInfo'])->name('faq_getInfo');
+    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {