作者 ZhengBing He

tmp

... ... @@ -354,7 +354,7 @@ class FetchTicketProjects extends Command
// 第一负责人
$engineer_id = $assm_id;
if ($project_cate == 3)
$is_del = !empty($item["go_online"]);
$is_del = empty($item["go_online"]);
else{
// 域途,以服务时间为准 $item['yutu_service_start_time'] 是开始时间 + 有效天数 yutu_planday
$is_del = !empty($item['yutu_service_start_time']) && !empty($item['yutu_planday'])
... ...
... ... @@ -66,6 +66,20 @@ class AsideTicketController extends BaseController
->orWhere('company_name', 'like', '%' . $search . '%');
});
});
})
// 根据TicketProject的status字段筛选
->when($request->input('project_status') !== null, function ($query) use ($request) {
$projectStatus = $request->input('project_status');
return $query->whereHas('project', function ($q) use ($projectStatus) {
$q->where('status', $projectStatus);
});
})
// 根据TicketProject的project_cate字段筛选
->when($request->input('project_cate') !== null, function ($query) use ($request) {
$projectCate = $request->input('project_cate');
return $query->whereHas('project', function ($q) use ($projectCate) {
$q->where('project_cate', $projectCate);
});
});
// 添加排序功能
... ...
... ... @@ -33,6 +33,8 @@ class AsideTicketListRequest extends FormRequest
'size' => 'nullable|integer',
'sort_field' => 'nullable|in:created_at,plan_end_at',
'sort_order' => 'nullable|in:asc,desc',
'project_status' => 'nullable|in:1,2,3|integer',
'project_cate' => 'nullable|in:1,2,3,4|integer',
];
}
}
... ...