Merge branch 'sql_fix_0620' into debug

# Conflicts:
#	models/data_manage/trade_analysis/trade_analysis.go

controllers/commodity_trade_base_index.go

@@ -74,6 +74,7 @@ func (this *TradeCommonController) ExchangeClassify() {
 	latestData, err := data_manage.GetLatestDate(exchange)
 	if err != nil {
 		br.Msg = "获取失败"
+		br.ErrMsg = "获取最新日期失败,Err:" + err.Error()
 		return
 	}
 

models/data_manage/base_from_trade_index.go

@@ -121,7 +121,7 @@ func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType str
 		_, err = o.Raw(sql, date).QueryRows(&list)
 		return
 	} else if classifyType == "" {
-		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? ORDER BY classify_type,rank"
+		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? ORDER BY classify_type,`rank`"
 		_, err = o.Raw(sql, date, classifyName).QueryRows(&list)
 		return
 	} else {
@@ -677,14 +677,14 @@ func GetSSOAndFacEicDateV2(date, name string) (data []*BaseFromTradeEicIndexV2,
 
 func GetBaseFromTradeIndexByDate(exchange, startDate, endDate string) (list []*BaseFromTradeShanghaiIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where rank < 50 and data_time between ? and ? order by data_time asc"
+	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 and data_time between ? and ? order by data_time asc"
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 	return
 }
 
 func GetFirstBaseFromTradeIndexByDate(exchange string) (item *BaseFromTradeShanghaiIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where rank < 50 order by data_time asc"
+	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 order by data_time asc"
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }

models/data_manage/trade_analysis/trade_analysis.go

@@ -94,7 +94,7 @@ func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error)
 	if exchange == "zhengzhou" {
 		orderStr = "classify_name asc"
 	}
-	sql := `SELECT classify_name, classify_type FROM ` + tableName + ` WHERE rank <=20 and rank > 0 GROUP BY classify_name, classify_type  `
+	sql := "SELECT classify_name, classify_type FROM ` + tableName + ` WHERE `rank` <=20 and `rank` > 0 GROUP BY classify_name, classify_type  "
 	sql += ` ORDER BY ` + orderStr
 
 	o := orm.NewOrmUsingDB("data")