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

@@ -40,7 +40,7 @@ class TicketController extends BaseController
             'logs.engineer',
             'logs.engineer',
         ])
         ])
             ->where('project_id', $project->id)
             ->where('project_id', $project->id)
-            ->where('title','!=','研发工单(客户不可见)')
+            ->where('title', 'not like', '研发工单%')
 //            ->where('submit_side', 2)
 //            ->where('submit_side', 2)
             ->when($request->input('status') !== null, function ($query) use ($request) {
             ->when($request->input('status') !== null, function ($query) use ($request) {
                 // status 查 gl_tickets.status
                 // status 查 gl_tickets.status
@@ -281,4 +281,18 @@ class TicketController extends BaseController
         $uuid = $ticketProjectModel->getValue(['post_id'=>$this->param['post_id'],'project_cate'=>$this->param['project_cate']],'uuid');
         $uuid = $ticketProjectModel->getValue(['post_id'=>$this->param['post_id'],'project_cate'=>$this->param['project_cate']],'uuid');
         $this->response('success',Code::SUCCESS,['project_id'=>$uuid]);
         $this->response('success',Code::SUCCESS,['project_id'=>$uuid]);
     }
     }
+
+    /**
+     * @remark :类型
+     * @name   :getorderTypeOptions
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/27 17:02
+     */
+    public function getorderTypeOptions()
+    {
+        $ticket = new Tickets();
+        $data = $ticket->getApiOrderTypeOptions();
+        $this->response('success', Code::SUCCESS, $data);
+    }
 }
 }

@@ -163,12 +163,30 @@ class Tickets extends Base
         ];
         ];
         $dataSon = [
         $dataSon = [
             '研发工单'=>[
             '研发工单'=>[
-                '1'=>['工单系统'=>'李宇航','页面及可视化'=>'刘俊杰','翻译'=>'李文涛','v5问题'=>'张关杰','其他问题'=>''],
-                '2'=>['工单系统'=>'李宇航','oa管理系统'=>'李宇航','v6管理系统'=>'李宇航','社媒分享'=>'李宇航','C端页面生成'=>'李小龙','页面及可视化'=>'刘俊杰','翻译'=>'李文涛','其他问题'=>''],
-                '3'=>['Whatsapp'=>'赵彬吉','邮件群发'=>'邓超','社媒'=>'何正兵','AI模型'=>'何正兵','其他问题'=>'朱世亮'],
-                '4'=>['Whatsapp'=>'赵彬吉','邮件群发'=>'邓超','社媒'=>'何正兵','AI模型'=>'何正兵','其他问题'=>'朱世亮'],
+                '1'=>['工单系统'=>189,'页面及可视化'=>23,'翻译'=>81,'v5问题'=>14,'其他问题'=>0],
+                '2'=>['工单系统'=>189,'oa管理系统'=>189,'v6管理系统'=>189,'社媒分享'=>189,'C端页面生成'=>196,'页面及可视化'=>23,'翻译'=>81,'其他问题'=>0],
+                '3'=>['Whatsapp'=>98,'邮件群发'=>99,'社媒'=>30,'AI模型'=>30,'其他问题'=>152],
+                '4'=>['Whatsapp'=>98,'邮件群发'=>99,'社媒'=>30,'AI模型'=>30,'其他问题'=>152],
             ]
             ]
         ];
         ];
         return ['type'=>$data, 'data'=>$dataSon];
         return ['type'=>$data, 'data'=>$dataSon];
     }
     }
+
+    /**
+     * @remark :客户提交工单类型
+     * @name   :getApiOrderTypeOptions
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/27 17:01
+     */
+    public function getApiOrderTypeOptions()
+    {
+        $data = [
+            '1' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核'],
+            '2' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核','GEO项目'],
+            '3' => ['功能问题', '操作问题', '数据问题', '功能需求', '培训需求', '其他问题'],
+            '4' => ['账号问题', '报告分析', '效果问题', '发帖问题', '视频问题', '美工设计', '其他问题',]
+        ];
+        return $data;
+    }
 }
 }

@@ -86,6 +86,7 @@ Route::get('/get_manage_by_domain', [\App\Http\Controllers\Api\PrivateController
 Route::any('/get_project_by_mch_id', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByMchId']);
 Route::any('/get_project_by_mch_id', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByMchId']);
 //获取项目uuid
 //获取项目uuid
 Route::any('/getProjectUuid',[\App\Http\Controllers\Api\WorkOrder\TicketController::class,'getProjectUuid']);
 Route::any('/getProjectUuid',[\App\Http\Controllers\Api\WorkOrder\TicketController::class,'getProjectUuid']);
+Route::any('/getorderTypeOptions',[\App\Http\Controllers\Api\WorkOrder\TicketController::class,'getorderTypeOptions']);
 
 
 // B端，渠道在企微群操作-售后工单
 // B端，渠道在企微群操作-售后工单
 Route::prefix('tickets')->group(function () {
 Route::prefix('tickets')->group(function () {