|
@@ -767,34 +767,42 @@ func (this *TargetController) ClassifyList() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- classifyIdStrList := make([]string, 0)
|
|
|
+ classifyIdList := make([]int, 0)
|
|
|
for _, classifyList := range list {
|
|
|
if classifyList.Child != nil {
|
|
|
for _, classify := range classifyList.Child {
|
|
|
- classifyIdStrList = append(classifyIdStrList, strconv.Itoa(classify.ClassifyId))
|
|
|
+ classifyIdList = append(classifyIdList, classify.ClassifyId)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if len(classifyIdStrList) > 0 {
|
|
|
- edbInfoGroupCountList, err := models.GetEdbInfoGroupCountByClassifyIds(strings.Join(classifyIdStrList, ","))
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取分类下有数据的指标数量失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- edbInfoGroupCountMap := make(map[int]int)
|
|
|
- for _, edbInfoGroupCount := range edbInfoGroupCountList {
|
|
|
- edbInfoGroupCountMap[edbInfoGroupCount.ClassifyId] = edbInfoGroupCount.Count
|
|
|
- }
|
|
|
+ if len(classifyIdList) > 0 {
|
|
|
+ //edbInfoGroupCountList, err := models.GetEdbInfoGroupCountByClassifyIds(classifyIdList)
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "获取失败"
|
|
|
+ // br.ErrMsg = "获取分类下有数据的指标数量失败,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //
|
|
|
+ //edbInfoGroupCountMap := make(map[int]int)
|
|
|
+ //for _, edbInfoGroupCount := range edbInfoGroupCountList {
|
|
|
+ // edbInfoGroupCountMap[edbInfoGroupCount.ClassifyId] = edbInfoGroupCount.Count
|
|
|
+ //}
|
|
|
+ //for _, classifyList := range list {
|
|
|
+ // classifyList.UniqueCode = utils.MD5(fmt.Sprint(classifyList.ClassifyId))
|
|
|
+ // if classifyList.Child != nil {
|
|
|
+ // for _, classify := range classifyList.Child {
|
|
|
+ // if total, ok := edbInfoGroupCountMap[classify.ClassifyId]; ok {
|
|
|
+ // classify.EdbInfoTotal = total
|
|
|
+ // classify.UniqueCode = utils.MD5(fmt.Sprint(classify.ClassifyId))
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
for _, classifyList := range list {
|
|
|
classifyList.UniqueCode = utils.MD5(fmt.Sprint(classifyList.ClassifyId))
|
|
|
if classifyList.Child != nil {
|
|
|
for _, classify := range classifyList.Child {
|
|
|
- if total, ok := edbInfoGroupCountMap[classify.ClassifyId]; ok {
|
|
|
- classify.EdbInfoTotal = total
|
|
|
- classify.UniqueCode = utils.MD5(fmt.Sprint(classify.ClassifyId))
|
|
|
- }
|
|
|
+ classify.UniqueCode = utils.MD5(fmt.Sprint(classify.ClassifyId))
|
|
|
}
|
|
|
}
|
|
|
}
|