Browse Source

Merge pull request '#1109 问题解决' (#1110) from zouap into V20211213

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1110
Reviewed-by: lewis <747342561@qq.com>
pull/1111/head
lewis 3 years ago
parent
commit
8e30966f2f
1 changed files with 13 additions and 3 deletions
  1. +13
    -3
      models/cloudbrain.go

+ 13
- 3
models/cloudbrain.go View File

@@ -962,13 +962,23 @@ func QueryModelTrainJobList(repoId int64) ([]*CloudbrainInfo, int, error) {
cond = cond.And( cond = cond.And(
builder.Eq{"Status": "COMPLETED"}, builder.Eq{"Status": "COMPLETED"},
) )
sess.OrderBy("job_id DESC")
cloudbrains := make([]*CloudbrainInfo, 0) cloudbrains := make([]*CloudbrainInfo, 0)
if err := sess.Distinct("job_id,job_name").Table(&Cloudbrain{}).Where(cond).
if err := sess.Select("job_id,job_name").Table(&Cloudbrain{}).Where(cond).OrderBy("created_unix DESC").
Find(&cloudbrains); err != nil { Find(&cloudbrains); err != nil {
return nil, 0, fmt.Errorf("Find: %v", err) return nil, 0, fmt.Errorf("Find: %v", err)
} }
return cloudbrains, int(len(cloudbrains)), nil

keys := make(map[string]string)
uniqueElements := make([]*CloudbrainInfo, 0)
for _, entry := range cloudbrains {
if _, value := keys[entry.JobID]; !value {
keys[entry.JobID] = entry.JobName
uniqueElements = append(uniqueElements, entry)
}
}

return uniqueElements, int(len(uniqueElements)), nil
} }


func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, error) { func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, error) {


Loading…
Cancel
Save