Merge pull request '解决：调试任务列表页面出现训练任务' (#1230) from fix-1218 into V20211228

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1230
Reviewed-by: liuzx <liuzx@pcl.ac.cn>

models/cloudbrain.go

@@ -210,6 +210,7 @@ type CloudbrainsOptions struct {
 	JobType         string
 	VersionName     string
 	IsLatestVersion string
+	JobTypeNot		bool
 }
 
 type TaskPod struct {
@@ -894,9 +895,15 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 	}
 
 	if (opts.JobType) != "" {
-		cond = cond.And(
-			builder.Eq{"cloudbrain.job_type": opts.JobType},
-		)
+		if opts.JobTypeNot {
+			cond = cond.And(
+				builder.Neq{"cloudbrain.job_type": opts.JobType},
+			)
+		} else {
+			cond = cond.And(
+				builder.Eq{"cloudbrain.job_type": opts.JobType},
+			)
+		}
 	}
 
 	if (opts.IsLatestVersion) != "" {

routers/repo/modelarts.go

@@ -60,8 +60,10 @@ func DebugJobIndex(ctx *context.Context) {
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
 		},
-		RepoID:  repo.ID,
-		Type:    debugType,
+		RepoID:     repo.ID,
+		Type:       debugType,
+		JobTypeNot: true,
+		JobType:    string(models.JobTypeTrain),
 	})
 	if err != nil {
 		ctx.ServerError("Get debugjob faild:", err)
@@ -367,6 +369,7 @@ func TrainJobIndex(ctx *context.Context) {
 		},
 		RepoID:          repo.ID,
 		Type:            models.TypeCloudBrainTwo,
+		JobTypeNot:      false,
 		JobType:         string(models.JobTypeTrain),
 		IsLatestVersion: modelarts.IsLatestVersion,
 	})