From f2eaac50a6f6957c826a422114e554a02205d594 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 14:38:20 +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=E5=8C=BA=E9=97=B4=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 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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