|
...
|
...
|
@@ -3,6 +3,7 @@ |
|
|
|
namespace App\Http\Controllers\Api\WorkOrder;
|
|
|
|
|
|
|
|
use App\Http\Controllers\Api\BaseController;
|
|
|
|
use App\Http\Requests\Api\WorkOrder\TicketListRequest;
|
|
|
|
use App\Http\Requests\Api\WorkOrder\TicketStoreRequest;
|
|
|
|
use App\Models\WorkOrder\TicketLog;
|
|
|
|
use App\Models\WorkOrder\TicketProject;
|
|
...
|
...
|
@@ -17,8 +18,9 @@ class TicketController extends BaseController |
|
|
|
*
|
|
|
|
* @return \Illuminate\Http\Response
|
|
|
|
*/
|
|
|
|
public function index($project_id, Request $request)
|
|
|
|
public function index(TicketListRequest $request, $project_id)
|
|
|
|
{
|
|
|
|
$validated = $request->validated();
|
|
|
|
$project = TicketProject::where('uuid', $project_id)->first();
|
|
|
|
if (!$project) return $this->error('未找到项目', 404);
|
|
|
|
$page = (int)$request->input('page', 1);
|
|
...
|
...
|
@@ -30,6 +32,22 @@ class TicketController extends BaseController |
|
|
|
])
|
|
|
|
->where('project_id', $project->id)
|
|
|
|
// ->where('submit_side', 2)
|
|
|
|
->when($request->input('status') !== null, function ($query) use ($request) {
|
|
|
|
// status 查 gl_tickets.status
|
|
|
|
$status = $request->input('status');
|
|
|
|
return $query->where('status', $status);
|
|
|
|
})
|
|
|
|
->when($request->input('search'), function ($query) use ($request) {
|
|
|
|
// search 查 gl_tickets.title 或 gl_ticket_projects.title 或 gl_ticket_projects.company_name
|
|
|
|
$search = $request->input('search');
|
|
|
|
return $query->where(function ($q) use ($search) {
|
|
|
|
$q->where('title', 'like', '%' . $search . '%')
|
|
|
|
->orWhereHas('project', function ($q1) use ($search) {
|
|
|
|
$q1->where('title', 'like', '%' . $search . '%')
|
|
|
|
->orWhere('company_name', 'like', '%' . $search . '%');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
})
|
|
|
|
->orderBy('id', 'desc')
|
|
|
|
->paginate($size, ['*'], 'page', $page);
|
|
|
|
return response()->json(['data' => $tickets]);
|
...
|
...
|
|