github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 19:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 设置子任务时间主任务出现1970的情况

Browse Source
This commit is contained in:
kuaifan 2024-10-31 19:42:41 +08:00
parent 3e15a3341c
commit 698d03f77e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/ProjectTask.php
View File

@ -781,11 +781,11 @@ class ProjectTask extends AbstractModel
// 判断同步主任务时间（子任务时间 超出 主任务） // 判断同步主任务时间（子任务时间 超出 主任务）
if ($mainTask) { if ($mainTask) {
$isUp = false; $isUp = false;
if ($start_at->lt(Carbon::parse($mainTask->start_at))) { if (empty($mainTask->start_at) || $start_at->lt(Carbon::parse($mainTask->start_at))) {
$mainTask->start_at = $start_at; $mainTask->start_at = $start_at;
$isUp = true; $isUp = true;
} }
if ($end_at->gt(Carbon::parse($mainTask->end_at))) { if (empty($mainTask->end_at) || $end_at->gt(Carbon::parse($mainTask->end_at))) {
$mainTask->end_at = $end_at; $mainTask->end_at = $end_at;
$isUp = true; $isUp = true;
} }