Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1.仪表盘显示可见性有我，但不是我负责的任务的bug ，2.审批评论间距样式调整与可评论emoj表情加评论通知 ，3,添加任务判断是否存在交集时间内任务调整 ，4. 审批流程撤回后显示错误修复, 5. 审批添加评论后自动滚动到下方

Browse Source
This commit is contained in:
weifashi
2023-07-21 20:59:08 +08:00
parent 94f1e764bc
commit 42f805d7cc
10 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1079,8 +1079,8 @@ class ProjectController extends AbstractController
$timerange = explode(',', $timerange);
}
if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
$query->where('project_tasks.start_at', '>=', Carbon::parse($timerange[0])->startOfDay());
$query->where('project_tasks.end_at', '<=', Carbon::parse($timerange[1])->endOfDay());
$query->where('project_tasks.start_at', '<=', Carbon::parse($timerange[1])->endOfDay());
$query->where('project_tasks.end_at', '>=', Carbon::parse($timerange[0])->startOfDay());
}
})
->when(!empty($taskid), function ($query) use ($taskid) {