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

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

Browse Source
This commit is contained in:
韦荣超 2022-03-04 17:27:35 +08:00
parent b332c4e23d
commit 6f8a4af5eb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Tasks/OverdueRemindEmailTask.php
View File

@ -24,20 +24,18 @@ class OverdueRemindEmailTask extends AbstractTask
$taskLists1 = [];
$taskLists2 = [];
if ($hours > 0) {
$time1 = Carbon::now()->addMinutes($hours * 60);
$taskLists1 = ProjectTask::whereNull('complete_at')
->where('end_at', '>=', $time1->subMinutes(30))
->where('end_at', '<=', $time1->addMinutes(30))
->where('end_at', '>=', Carbon::now()->addMinutes($hours * 60 - 30)->rawFormat('Y-m-d H:i:s'))
->where('end_at', '<=', Carbon::now()->addMinutes($hours * 60 + 30)->rawFormat('Y-m-d H:i:s'))
->whereNull('archived_at')
->take(100)
->get()
->toArray();
}
if ($hours2 > 0) {
$time2 = Carbon::now()->subMinutes($hours2 * 60);
$taskLists2 = ProjectTask::whereNull('complete_at')
->where('end_at', '>=', $time2->subMinutes(30))
->where('end_at', '<=', $time2->addMinutes(30))
->where('end_at', '>=', Carbon::now()->subMinutes($hours2 * 60 - 30)->rawFormat('Y-m-d H:i:s'))
->where('end_at', '<=', Carbon::now()->subMinutes($hours * 60 + 30)->rawFormat('Y-m-d H:i:s'))
->whereNull('archived_at')
->take(100)
->get()