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

fix: 任务统计导出完成时间为空时，不应出现实际完成用时

Browse Source
This commit is contained in:
韦荣超 2022-03-04 16:38:08 +08:00
parent f2eaac50a6
commit 47c0c3fa3f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/ProjectController.php
View File

@ -1102,6 +1102,7 @@ class ProjectController extends AbstractController
}
$planTime = Base::timeDiff($startTime, $endTime);
}
$actualTime = $task->complete_at ? $totalTime : 0;//实际完成用时
$datas[] = [
$task->id,
$task->parent_id ?: '-',
@ -1112,7 +1113,7 @@ class ProjectController extends AbstractController
$task->complete_at ?: '-',
$task->archived_at ?: '-',
$planTime ?: '-',
$totalTime ? Base::timeFormat($totalTime) : '-',
$actualTime ? Base::timeFormat($actualTime) : '-',
$overTime,
$developTime > 0? Base::timeFormat($developTime) : '-',
$testTime > 0 ? Base::timeFormat($testTime) : '-',