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

变更数据



查看合并请求 !3337

@@ -285,6 +285,7 @@ class AsideTicketController extends BaseController
             $ticket->plan_end_at = $request->input('plan_end_at', null);
             $ticket->plan_end_at = $request->input('plan_end_at', null);
             $ticket->close_wechat = $request->input('close_wechat', false);
             $ticket->close_wechat = $request->input('close_wechat', false);
             $ticket->num = $request->input('num', 0);
             $ticket->num = $request->input('num', 0);
+            $ticket->is_user_look = $request->input('is_user_look',1);
             $ticket->save();
             $ticket->save();
             // 分配工单参与人
             // 分配工单参与人
             $ticket->saveEngineers($request->input('engineer_ids', []));
             $ticket->saveEngineers($request->input('engineer_ids', []));
@@ -398,4 +399,23 @@ class AsideTicketController extends BaseController
             $this->response('请先点击开关，打开微信推送', Code::USER_MODEL_NOTFOUND_ERROE);
             $this->response('请先点击开关，打开微信推送', Code::USER_MODEL_NOTFOUND_ERROE);
         $this->response('success', Code::SUCCESS);
         $this->response('success', Code::SUCCESS);
     }
     }
+
+    /**
+     * @remark :获取工单类型
+     * @name   :getorderTypeOptions
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/24 15:38
+     */
+    public function getorderTypeOptions()
+    {
+        $this->request->validate([
+            'project_cate'=>'required'
+        ],[
+            'project_cate.required' => 'ID不能为空'
+        ]);
+        $ticket = new Tickets();
+        $data = $ticket->getOrderTypeOptions($this->param['project_cate']);
+        $this->response('success', Code::SUCCESS, $data);
+    }
 }
 }

@@ -119,6 +119,7 @@ class GeoQuestionLogic extends BaseLogic
             }else{
             }else{
                 $this->param['next_time'] = date('Y-m-d');
                 $this->param['next_time'] = date('Y-m-d');
                 foreach ($chunks as $chunk) {
                 foreach ($chunks as $chunk) {
+                    $this->param['question_num'] = count($chunk);
                     $this->param['question'] = json_encode($chunk ?? [],true);
                     $this->param['question'] = json_encode($chunk ?? [],true);
                     $id = $this->model->addReturnId($this->param);
                     $id = $this->model->addReturnId($this->param);
                 }
                 }

@@ -146,4 +146,27 @@ class Tickets extends Base
         }
         }
     }
     }
 
 
+    /**
+     * @remark :
+     * @name   :getorderTypeOptions
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/24 14:43
+     */
+    public function getorderTypeOptions($project_cate = 1)
+    {
+        $data = [
+            '1' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核','研发工单'],
+            '2' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核','GEO项目','研发工单'],
+            '3' => ['功能问题', '操作问题', '数据问题', '功能需求', '培训需求', '其他问题','研发工单'],
+            '4' => ['账号问题', '报告分析', '效果问题', '发帖问题', '视频问题', '美工设计', '其他问题','研发工单']
+        ];
+        $manage_data = [
+            '1' => ['李宇航','刘俊杰','李小龙'],
+            '2' => ['周海龙','李宇航','刘俊杰','李小龙','赵斌吉','刘坤'],
+            '3' => ['李宇航','刘俊杰','李小龙'],
+            '4' => ['李宇航','刘俊杰','李小龙'],
+        ];
+        return $data[$project_cate];
+    }
 }
 }