From 6f8a4af5ebc626e8e1bbda2895459ec3291eace4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Fri, 4 Mar 2022 17:27:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Tasks/OverdueRemindEmailTask.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Tasks/OverdueRemindEmailTask.php b/app/Tasks/OverdueRemindEmailTask.php
index 406c74ab8..bfcb26cb8 100644
--- a/app/Tasks/OverdueRemindEmailTask.php
+++ b/app/Tasks/OverdueRemindEmailTask.php
@@ -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()