|
@@ -21,12 +21,20 @@ type GlData struct {
|
|
|
}
|
|
|
|
|
|
func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData, err error) {
|
|
|
- sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
|
|
|
- o := orm.NewOrmUsingDB("data")
|
|
|
+ //sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
|
|
|
+ //o := orm.NewOrmUsingDB("data")
|
|
|
+ //if condition != "" {
|
|
|
+ // sql += condition
|
|
|
+ //}
|
|
|
+ //sql += ` ORDER BY PUBLISH_TIME DESC `
|
|
|
+ condition += " AND IS_DELETE=0 "
|
|
|
+ sql1 := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
|
|
|
+ o := orm.NewOrmUsingDB("gl")
|
|
|
if condition != "" {
|
|
|
- sql += condition
|
|
|
+ sql1 += condition
|
|
|
}
|
|
|
- sql += ` ORDER BY PUBLISH_TIME DESC `
|
|
|
+ sql := `select * from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by DATA_DATE ORDER BY PUBLISH_TIME DESC `
|
|
|
+
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&item)
|
|
|
return
|
|
|
}
|
|
@@ -48,8 +56,8 @@ func ModifyEdbDataGl(edbInfoId int64, dataTime, value string) (err error) {
|
|
|
//刷新钢联指标数据
|
|
|
func RefreshEdbDataByGl(edbInfoId int, edbCode, startDate, endDate string) (err error) {
|
|
|
o := orm.NewOrmUsingDB("data")
|
|
|
- tx,err:=o.Begin()
|
|
|
- if err!=nil {
|
|
|
+ tx, err := o.Begin()
|
|
|
+ if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
defer func() {
|