Browse Source

Merge branch 'ETA_1.8.7' into debug

zwxi 10 months ago
parent
commit
39c2ffd1a2
1 changed files with 13 additions and 11 deletions
  1. 13 11
      models/data_manage/edb_data_sci99.go

+ 13 - 11
models/data_manage/edb_data_sci99.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"eta/eta_api/models/data_source"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 )
@@ -18,17 +17,20 @@ func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err e
 	return
 }
 
-//type BaseFromSci99DataItem struct {
-//	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键,自动递增
-//	BaseFromSciIndexId int       // 指标id
-//	IndexCode          string    // 指标编码
-//	DataTime           string    // 数据日期
-//	Value              float64   // 数据值
-//	CreateTime         string // 创建时间
-//	ModifyTime         string // 修改时间
-//}
+type BaseFromSci99IndexItem struct {
+	BaseFromSciIndexId int    `orm:"column(base_from_sci_index_id);pk"` // 主键,自动递增
+	IndexCode          string // 指标编码
+	IndexName          string // 指标名称
+	ClassifyId         int    // 分类Id
+	Unit               string // 单位
+	Frequency          string // 频度
+	Describe           string // 指标描述
+	CreateTime         string // 创建时间
+	ModifyTime         string // 修改时间
+}
+
 // GetBaseInfoFromSci99ByIndexCode 获取指标信息
-func GetBaseInfoFromSci99ByIndexCode(indexCode string) (item *data_source.BaseFromSci99Index, err error) {
+func GetBaseInfoFromSci99ByIndexCode(indexCode string) (item *BaseFromSci99IndexItem, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_sci99_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)