|
@@ -19,12 +19,25 @@ type GlData struct {
|
|
|
|
|
|
func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData, err error) {
|
|
|
condition += " AND IS_DELETE=0 "
|
|
|
- sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
|
|
|
+ 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 `
|
|
|
+
|
|
|
+ //select * from (
|
|
|
+ // select * from mb_index_main_data where
|
|
|
+ // 1 = 1
|
|
|
+ // AND DATA_VALUE IS NOT NULL
|
|
|
+ // AND INDEX_CODE ="ID00182580"
|
|
|
+ // AND DATA_DATE >="2016-09-01"
|
|
|
+ // AND IS_DELETE = 0 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
|
|
|
}
|