From 4d59cd1521bedc87c5eada81e7fed59fb9348ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Wed, 2 Mar 2022 15:36:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=9C=89=E6=B5=81=E7=A8=8B=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 356c7b7f4..893b020f1 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1055,10 +1055,10 @@ class ProjectController extends AbstractController
                 } else {
                     $endSurplus = '-';
                 }
-                $developFlowChanges = ProjectTaskFlowChange::whereTaskId($task->id)->get();
+                $flowChanges = ProjectTaskFlowChange::whereTaskId($task->id)->get();
                 $developTime = 0;//开发时间
                 $testTime = 0;//验收/测试时间
-                foreach ($developFlowChanges as $change) {
+                foreach ($flowChanges as $change) {
                     if (strpos($change->before_flow_item_name, 'end') === false) {
                         $upOne = ProjectTaskFlowChange::where('id', '<', $change->id)->whereTaskId($task->id)->orderByDesc('id')->first();
                         if ($upOne) {
@@ -1092,6 +1092,10 @@ class ProjectController extends AbstractController
                     $firstDevTime = Carbon::parse($firstChange->created_at)->timestamp - Carbon::parse($task->created_at)->timestamp;
                     $developTime += $firstDevTime;
                 }
+                if (count($flowChanges) === 0) {
+                    $lastTime = $task->complete_at ? Carbon::parse($task->complete_at)->timestamp : time();
+                    $developTime = $lastTime - Carbon::parse($task->created_at)->timestamp;
+                }
                 $totalTime = $developTime + $testTime; //任务总用时
                 $planTime = '-';//任务计划用时
                 $overTime = '-';//超时时间