From 47c0c3fa3fa947ce255c8fac39a55bcbb74118bf 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 16:38:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=AE=8C=E6=88=90=E7=94=A8=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index e36c696c3..417e289d2 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -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) : '-',