Browse Source

Merge branch 'V20221130' into fix-2775-v1

tags/v1.22.11.3^2
zhoupzh 3 years ago
parent
commit
13869df45e
2 changed files with 3 additions and 2 deletions
  1. +3
    -0
      modules/cloudbrain/cloudbrain.go
  2. +0
    -2
      routers/repo/cloudbrain_statistic.go

+ 3
- 0
modules/cloudbrain/cloudbrain.go View File

@@ -661,6 +661,9 @@ func GetCloudBrainByIdOrJobId(id string) (*models.Cloudbrain,error) {
job, err = models.GetCloudbrainByJobID(id)
} else {
job, err = models.GetCloudbrainByID(id)
if err!=nil{
job, err = models.GetCloudbrainByJobID(id)
}

}
return job,err


+ 0
- 2
routers/repo/cloudbrain_statistic.go View File

@@ -1,7 +1,6 @@
package repo

import (
"fmt"
"net/http"
"strings"
"time"
@@ -69,7 +68,6 @@ func summaryDurationStat(statisticTime time.Time) int64 {
log.Info("GetCloudbrainByTime err: %v", err)
return 0
}
fmt.Printf("ciTasks:", ciTasks[0].Cloudbrain.JobName)
models.LoadSpecs4CloudbrainInfo(ciTasks)
cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime)



Loading…
Cancel
Save