浏览代码

fix:添加卓创红期分类和指标的UniqueCode

zqbao 7 月之前
父节点
当前提交
9cdc87c751

+ 4 - 0
controllers/data_manage/sci_hq_data.go

@@ -49,6 +49,7 @@ func (this *SciHqDataController) Classify() {
 		ClassifyId:     0,
 		ClassifyName:   "未分类",
 		ClassifyNameEn: "Unclassified",
+		UniqueCode:     "0",
 		ParentId:       0,
 		Level:          1,
 		Sort:           0,
@@ -1543,6 +1544,9 @@ func getSciHqClassifyTree(items []*data_manage.BaseFromSciHqClassifyItem, parent
 			t.ModifyTime = item.ModifyTime
 			t.CreateTime = item.CreateTime
 			t.ClassifyNameEn = item.ClassifyNameEn
+			if item.UniqueCode == "" {
+				t.UniqueCode = strconv.Itoa(item.ClassifyId)
+			}
 			t.Children = getSciHqClassifyTree(items, item.ClassifyId)
 			res = append(res, t)
 		}

+ 1 - 0
models/data_manage/base_from_sci_hq_classify.go

@@ -25,6 +25,7 @@ type BaseFromSciHqClassifyItem struct {
 	ParentId       int                          `description:"父级id"`
 	Level          int                          `description:"层级"`
 	Sort           int                          `description:"排序字段"`
+	UniqueCode     string                       `description:"唯一code"`
 	ModifyTime     time.Time                    `description:"修改时间"`
 	CreateTime     time.Time                    `description:"创建时间"`
 	ClassifyNameEn string                       `description:"英文分类名称"`

+ 3 - 3
models/data_manage/base_from_sci_hq_index.go

@@ -29,7 +29,7 @@ type BaseFromSciHqIndexView struct {
 	ClassifyId           int    `description:"指标分类id"`
 	IndexCode            string `description:"指标编码"`
 	IndexName            string `description:"指标名称"`
-	Unit                 string `description:"单位"`
+	UniqueCode           string `description:"唯一code"`
 	Frequency            string `description:"频度"`
 	StartDate            string `description:"开始日期"`
 	EndDate              string `description:"结束日期"`
@@ -166,9 +166,9 @@ func GetSciHqIndexByPage(startSize, pageSize int) (items []*BaseFromSciHqIndex,
 }
 
 // GetSciHqIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
-func GetSciHqIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromSciHqIndex, err error) {
+func GetSciHqIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromSciHqIndexView, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT base_from_sci_hq_index_id, classify_id, index_code, index_name  FROM base_from_sci_hq_index WHERE classify_id = ? ORDER BY sort ASC `
+	sql := ` SELECT base_from_sci_hq_index_id, classify_id, index_code, index_name, CONCAT(classify_id, '_', base_from_sci_hq_index_id) AS unique_code  FROM base_from_sci_hq_index WHERE classify_id = ? ORDER BY sort ASC `
 	_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	return
 }