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

@@ -109,15 +109,31 @@ class AsideTicketController extends BaseController
         //TODO::用户部门搜索
         //TODO::用户部门搜索
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
         if(isset($this->param['dept_id']) && !empty($this->param['dept_id'])){
             $manageHrModel = new ManageHr();
             $manageHrModel = new ManageHr();
-            $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
-            $query->whereHas('logs', function ($q) use ($manageIdArr) {
-                $q->whereIn('engineer_id', $manageIdArr);
-            });
+            //售后优化+技术搜索
+            if($this->param['dept_id'] == 2 && !empty($this->param['entry_position'])) {//售后部
+                if ($this->param['entry_position'] == 1) {
+                    $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [44, 46, 49]], 'status' => 1], 'manage_id');
+                } else {
+                    //售后技术
+                    $manageIdArr = $manageHrModel->selectField(['entry_position' => ['in', [42, 43, 45, 48, 51]], 'status' => 1], 'manage_id');
+                }
+                $query->whereHas('logs', function ($q) use ($manageIdArr) {
+                    $q->whereIn('engineer_id', $manageIdArr);
+                });
+            }else{
+                $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
+                $query->whereHas('logs', function ($q) use ($manageIdArr) {
+                    $q->whereIn('engineer_id', $manageIdArr);
+                });
+            }
         }
         }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
             return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
         }
         }
-
+        //搜索提交人姓名
+        if(!empty($this->param['submit_username'])){
+            return $query->where('submit_username','%'.$this->param['submit_username'].'%');
+        }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');
 //        $query->orderBy('id', 'desc');
 //        $query->orderBy('id', 'desc');
@@ -142,113 +158,6 @@ class AsideTicketController extends BaseController
         $this->response('success', Code::SUCCESS, $lists);
         $this->response('success', Code::SUCCESS, $lists);
     }
     }
 
 
-    /**
-     * @remark :列表数据
-     * @name   :lists
-     * @author :lyh
-     * @method :post
-     * @time   :2025/9/1 16:45
-     */
-    public function lists(AsideTicketListRequest $request)
-    {
-        $validated = $request->validated();
-        $ticketsModel = new Tickets();
-        $query = $ticketsModel->leftJoin('gl_ticket_projects', 'gl_ticket_projects.id', '=', 'gl_tickets.project_id')
-            ->leftJoin('gl_ticket_logs', 'gl_ticket_logs.ticket_id', '=', 'gl_tickets.id')
-            ->select([
-                'gl_tickets.*',
-                'gl_ticket_projects.title as project_title',
-                'gl_ticket_projects.company_name as project_company',
-                'gl_ticket_projects.status as project_status',
-                'gl_ticket_projects.project_cate as project_cate',
-            ])
-            ->distinct(); // 避免多条 logs 时数据重复
-
-        // 工程师过滤
-        if (!empty($validated['engineer_id'])) {
-            $engineerId = $validated['engineer_id'];
-            $query->where(function ($q) use ($engineerId) {
-                $q->where('gl_tickets.submit_user_id', $engineerId)
-                    ->orWhere('gl_ticket_logs.engineer_id', $engineerId);
-            });
-        }
-        // project_id 过滤
-        if ($request->filled('project_id')) {
-            $query->where('gl_ticket_projects.uuid', $request->input('project_id'));
-        }
-        // status 过滤
-        if ($request->filled('status')) {
-            $status = $request->input('status');
-            if ($status == -1) {
-                $newTime = now()->subHours(120);
-                $query->where('gl_tickets.status', 0)
-                    ->where('gl_tickets.plan_end_at', '<', $newTime);
-            } else {
-                $query->where('gl_tickets.status', $status);
-            }
-        }
-        // timeout 过滤
-        if ($request->filled('timeout')) {
-            $timeout = (int)$request->input('timeout');
-            switch ($timeout) {
-                case 1: $newTime = now()->subHours(24); break;
-                case 2: $newTime = now()->subHours(48); break;
-                case 3: $newTime = now()->subHours(72); break;
-                default: $newTime = now(); break;
-            }
-            $query->where('gl_tickets.status', 0)
-                ->where('gl_tickets.plan_end_at', '<', $newTime);
-        }
-        // star 过滤
-        if ($request->filled('star')) {
-            $query->where('gl_tickets.star', $request->input('star'));
-        }
-        // search 模糊搜索
-        if ($request->filled('search')) {
-            $search = $request->input('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('gl_tickets.title', 'like', "%$search%")
-                    ->orWhere('gl_ticket_projects.title', 'like', "%$search%")
-                    ->orWhere('gl_ticket_projects.company_name', 'like', "%$search%");
-            });
-        }
-        // project_status
-        if ($request->filled('project_status')) {
-            $query->where('gl_ticket_projects.status', $request->input('project_status'));
-        }
-        // project_cate
-        if ($request->filled('project_cate')) {
-            $query->where('gl_ticket_projects.project_cate', $request->input('project_cate'));
-        }
-        // 部门搜索
-        if (!empty($this->param['dept_id'])) {
-            $manageHrModel = new ManageHr();
-            $manageIdArr = $manageHrModel->selectField(['dept_id'=>$this->param['dept_id'],'status'=>1],'manage_id');
-            $query->whereIn('gl_ticket_logs.engineer_id', $manageIdArr);
-        }
-        // 时间区间
-        if (!empty($this->param['start_at']) && !empty($this->param['end_at'])) {
-            $query->whereBetween('gl_tickets.created_at', [$this->param['start_at'], $this->param['end_at']]);
-        }
-        // 排序
-        $query->orderBy('gl_tickets.status', 'asc');
-        $sortField = $request->input('sort_field', 'gl_tickets.plan_end_at');
-        $sortOrder = strtolower($request->input('sort_order', 'asc'));
-        $query->orderBy($sortField, $sortOrder);
-        if ($sortField != 'gl_tickets.plan_end_at') {
-            $query->orderBy('gl_tickets.plan_end_at', 'asc');
-        }
-        // 分页 (建议用 simplePaginate 提速)
-        $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
-        // 计算超时小时数（也可以 SQL 里用 TIMESTAMPDIFF 算好）
-        foreach ($lists as $item) {
-            if ($item->status == 0 && $item->plan_end_at < now()) {
-                $item->plan_ent_time = diffInHours($item->plan_end_at, now());
-            }
-        }
-        $this->response('success', Code::SUCCESS, $lists);
-    }
-
         /**
         /**
      * @param $search
      * @param $search
      * @return void
      * @return void