github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat：简单任务列表 - 过滤掉已完成任务

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

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

@ -1070,7 +1070,7 @@ class ProjectController extends AbstractController
->leftJoin('project_task_users', function ($query) {
$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) {
if (!is_array($timerange)) {
$timerange = explode(',', $timerange);
@ -1079,6 +1079,7 @@ class ProjectController extends AbstractController
$query->whereBetween('project_tasks.created_at',[Carbon::parse($timerange[0])->startOfDay(),Carbon::parse($timerange[1])->endOfDay()] );
}
})
->whereNull('complete_at')
->orderByDesc('project_tasks.id')
->paginate(Base::getPaginate(200, 100));
//