github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-20 07:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 任务提醒时间区间错误修改

Browse Source
This commit is contained in:
韦荣超 2022-03-04 14:38:20 +08:00
parent ec8b0ada14
commit f2eaac50a6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Tasks/OverdueRemindEmailTask.php
View File

@ -23,22 +23,21 @@ class OverdueRemindEmailTask extends AbstractTask
$hours2 = floatval($setting['task_remind_hours2']); $hours2 = floatval($setting['task_remind_hours2']);
$taskLists1 = []; $taskLists1 = [];
$taskLists2 = []; $taskLists2 = [];
$startTime = Carbon::now();
if ($hours > 0) { if ($hours > 0) {
$endTime = Carbon::now()->addHours($hours); $time1 = Carbon::now()->addMinutes($hours * 60);
$taskLists1 = ProjectTask::whereNull('complete_at') $taskLists1 = ProjectTask::whereNull('complete_at')
->where('end_at', '>=', $startTime) ->where('end_at', '>=', $time1->subMinutes(2))
->where('end_at', '<=', $endTime) ->where('end_at', '<=', $time1->addMinutes(2))
->whereNull('archived_at') ->whereNull('archived_at')
->take(100) ->take(100)
->get() ->get()
->toArray(); ->toArray();
} }
if ($hours2 > 0) { if ($hours2 > 0) {
$endTime2 = Carbon::now()->subHours($hours2); $time2 = Carbon::now()->subMinutes($hours2 * 60);
$taskLists2 = ProjectTask::whereNull('complete_at') $taskLists2 = ProjectTask::whereNull('complete_at')
->where('end_at', '>=', $endTime2) ->where('end_at', '>=', $time2->subMinutes(2))
->where('end_at', '<', $startTime) ->where('end_at', '<=', $time2->addMinutes(2))
->whereNull('archived_at') ->whereNull('archived_at')
->take(100) ->take(100)
->get() ->get()