diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 7c38f5caa..d944a0f13 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -845,11 +845,12 @@ class ProjectTask extends AbstractModel $existAt = $this->start_at && !$clearSubTaskTime; $newStringAt = $existAt ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : ''; if ($isOverdue) { + $effectiveEndTime = $existAt ? Carbon::parse($this->end_at)->min(Carbon::now()) : Carbon::now(); $this->addLog("{任务}超期未完成", [ 'cache' => [ 'task_at' => $oldStringAt, 'change_at' => $newStringAt, - 'over_sec' => ($existAt ? $this->end_at : Carbon::now())->diffInSeconds($oldAt[1]), + 'over_sec' => $effectiveEndTime->diffInSeconds($oldAt[1]), 'owners' => $this->taskUser->where('owner', 1)->pluck('userid')->toArray(), 'assists' => $this->taskUser->where('owner', 0)->pluck('userid')->toArray(), ]