github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-04 12:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

style：整理代码格式

Browse Source
This commit is contained in:
weifashi 2023-07-17 11:44:30 +08:00
parent 8476ed2e51
commit 02bd1deb2c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/ProjectController.php
View File

@ -1066,17 +1066,17 @@ class ProjectController extends AbstractController
$timerange = Request::input('timerange'); $timerange = Request::input('timerange');
// //
$list = ProjectTask::query() $list = ProjectTask::query()
->select('project_tasks.id','project_tasks.name','project_tasks.created_at','project_tasks.updated_at') ->select('project_tasks.id', 'project_tasks.name', 'project_tasks.created_at', 'project_tasks.updated_at')
->leftJoin('project_task_users', function ($query) { ->leftJoin('project_task_users', function ($query) {
$query->on('project_tasks.id', '=', 'project_task_users.task_id'); $query->on('project_tasks.id', '=', 'project_task_users.task_id');
}) })
->whereIn('project_task_users.userid', explode(',', $userid) ) ->whereIn('project_task_users.userid', explode(',', $userid))
->when(!empty($timerange),function ($query) use($timerange) { ->when(!empty($timerange), function ($query) use ($timerange) {
if (!is_array($timerange)) { if (!is_array($timerange)) {
$timerange = explode(',', $timerange); $timerange = explode(',', $timerange);
} }
if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) { if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
$query->whereBetween('project_tasks.created_at',[Carbon::parse($timerange[0])->startOfDay(),Carbon::parse($timerange[1])->endOfDay()] ); $query->whereBetween('project_tasks.created_at', [Carbon::parse($timerange[0])->startOfDay(), Carbon::parse($timerange[1])->endOfDay()]);
} }
}) })
->whereNull('complete_at') ->whereNull('complete_at')