Merge pull request 'fix-2383,fix-2365' (#2448) from fix-2365 into V20220718

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2448
Reviewed-by: lewis <747342561@qq.com>

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -752,10 +752,26 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 			taskDetail.RepoAlias = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Alias
 		}
 		if ciTasks[i].Cloudbrain.Status == string(models.JobWaiting) {
-			WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
-			taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
-			if WaitTimeInt < 0 {
-				taskDetail.WaitTime = "00:00:00"
+			if ciTasks[i].Cloudbrain.DeletedAt != nilTime {
+				WaitTimeInt := ciTasks[i].Cloudbrain.UpdatedUnix.AsTime().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+				taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+				if WaitTimeInt < 0 {
+					taskDetail.WaitTime = "00:00:00"
+				}
+			} else {
+				if ciTasks[i].Cloudbrain.StartTime.AsTime().Unix() == 0 {
+					WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+					taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+					if WaitTimeInt < 0 {
+						taskDetail.WaitTime = "00:00:00"
+					}
+				} else {
+					WaitTimeInt := ciTasks[i].Cloudbrain.StartTime.AsTime().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+					taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+					if WaitTimeInt < 0 {
+						taskDetail.WaitTime = "00:00:00"
+					}
+				}
 			}
 		} else if ciTasks[i].Cloudbrain.Status == string(models.JobStopped) && ciTasks[i].Cloudbrain.StartTime.AsTime().Unix() == 0 {
 			WaitTimeInt := ciTasks[i].Cloudbrain.EndTime.AsTime().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()