合并分支 'workorder' 到 'master'

projectList



查看合并请求 !2225

@@ -7,6 +7,7 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketStoreRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketListRequest;
 use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
+use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
@@ -82,6 +83,27 @@ class AsideTicketController extends BaseController
     }
 
     /**
+     * @param TicketProjectListRequest $request
+     * @return void
+     * A端V5V6项目列表
+     */
+    public function projectList(TicketProjectListRequest $request)
+    {
+        $validated = $request->validated();
+        $lists = TicketProject::where('is_del', 0)
+            ->when(!empty($validated['search']), function ($query) use ($validated) {
+                // 查找项目名称或公司名称
+                $search = $validated['search'];
+                return $query->where(function ($q) use ($search) {
+                    $q->where('title', 'like', '%' . $search . '%')
+                        ->orWhere('company_name', 'like', '%' . $search . '%');
+                });
+            })
+            ->paginate($this->row, ['*'], 'page', $this->page);
+        $this->response('success', Code::SUCCESS, $lists);
+    }
+
+    /**
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request

+<?php
+
+namespace App\Http\Requests\Aside\WorkOrder;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TicketProjectListRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'search' => 'nullable|string|max:255',
+        ];
+    }
+}

@@ -255,6 +255,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
         Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');
         Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
+        Route::get('/projectList', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表');
         Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');
         Route::get('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'index'])->name('admin.tickets.chat.index')->summary('A端工单聊天记录');
         Route::post('/chat/{ticket_id}', [Aside\WorkOrder\TicketChatController::class, 'store'])->name('admin.tickets.chat.store')->summary('A端工单聊天记录创建');