。。

models/edb_data_base.go

@@ -231,9 +231,13 @@ func GetEdbDataAllByEdbCode(edbCode string, source, subSource, limit int) (items
 	return
 }
 
-func GetEdbDataBaseByEdbCode(edbInfoId int, source, subSource int) (items []*EdbDataBase, err error) {
+func GetEdbDataBaseByEdbInfoId(edbInfoId int, source, subSource int) (items []*EdbDataBase, err error) {
 	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source, subSource)
+	if source == utils.DATA_SOURCE_PREDICT {
+		tableName = "edb_data_predict_base"
+	}
+
 	sql := ` SELECT * FROM %s WHERE edb_info_id=? ORDER BY data_time DESC`
 	sql = fmt.Sprintf(sql, tableName)
 	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)

services/chart_info.go

@@ -180,7 +180,7 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*models.EdbInfo, edb
 	}
 
 	for _, v := range edbInfoList {
-		dataList, e := models.GetEdbDataBaseByEdbCode(v.EdbInfoId, v.Source, v.SubSource)
+		dataList, e := models.GetEdbDataBaseByEdbInfoId(v.EdbInfoId, v.Source, v.SubSource)
 		if e != nil {
 			err = fmt.Errorf("查询指标数据失败 Err: %s", e.Error())
 			return

services/eta_forum/eta_forum_hub.go

@@ -153,7 +153,7 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*models.EdbInfo, edb
 	}
 
 	for _, v := range edbInfoList {
-		dataList, e := models.GetEdbDataBaseByEdbCode(v.EdbInfoId, v.Source, v.SubSource)
+		dataList, e := models.GetEdbDataBaseByEdbInfoId(v.EdbInfoId, v.Source, v.SubSource)
 		if e != nil {
 			err = fmt.Errorf("查询指标数据失败 Err: %s", e.Error())
 			return