Merge pull request '解决年度报告中的云脑任务数量不对的问题。' (#3490) from zouap into V20221228

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3490
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

models/user_business_analysis.go

@@ -2486,7 +2486,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,job_type,user_id,duration,train_job_duration,type,compute_resource").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		cloudTaskList := make([]*Cloudbrain, 0)
 		sess.Find(&cloudTaskList)
 		log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList)))
@@ -2519,7 +2519,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 				} else {
 					setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				}
-			} else if cloudTaskRecord.Type == 2 {
+			} else if cloudTaskRecord.Type == 2 || cloudTaskRecord.Type == 3 {
 				setMapKey("C2Net", cloudTaskRecord.UserID, 1, resultItemMap)
 				if cloudTaskRecord.ComputeResource == NPUResource {
 					if cloudTaskRecord.JobType == "TRAIN" {