|
@@ -25,7 +25,6 @@ type GlFrequency struct {
|
|
|
Frequency string `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
|
|
|
}
|
|
|
|
|
|
-
|
|
|
func GetGlFrequencyByClassifyId(breedShortName string) (items []*GlFrequency, err error) {
|
|
|
o := global.DbMap[utils.DbNameGL]
|
|
|
var sql string
|
|
@@ -95,7 +94,7 @@ type GlIndexList struct {
|
|
|
|
|
|
type GlIndexData struct {
|
|
|
InputValue string `description:"日期" gorm:"column:DATA_VALUE"`
|
|
|
- DataTime string `description:"值" gorm:"column:DATA_DATE"`
|
|
|
+ DataTime string `description:"值" gorm:"column:DATA_DATE"`
|
|
|
}
|
|
|
|
|
|
func (g *GlIndexData) AfterFind(tx *gorm.DB) (err error) {
|
|
@@ -189,10 +188,14 @@ func GetGlDataMaxCount(classifyName string) (count int, err error) {
|
|
|
}
|
|
|
|
|
|
func GetGlDataByCode(indexCode string) (items []*GlIndexData, err error) {
|
|
|
+ //sql := `SELECT * FROM (
|
|
|
+ // SELECT * FROM mb_index_main_data WHERE INDEX_CODE=?
|
|
|
+ // GROUP BY UPDATE_TIME DESC, DATA_DATE DESC
|
|
|
+ //) a GROUP BY a.DATA_DATE DESC`
|
|
|
sql := `SELECT * FROM (
|
|
|
SELECT * FROM mb_index_main_data WHERE INDEX_CODE=?
|
|
|
- GROUP BY UPDATE_TIME DESC, DATA_DATE DESC
|
|
|
- ) a GROUP BY a.DATA_DATE DESC`
|
|
|
+ GROUP BY UPDATE_TIME , DATA_DATE ORDER BY UPDATE_TIME DESC, DATA_DATE DESC
|
|
|
+ ) a GROUP BY a.DATA_DATE ORDER BY a.DATA_DATE DESC`
|
|
|
o := global.DbMap[utils.DbNameGL]
|
|
|
err = o.Raw(sql, indexCode).Find(&items).Error
|
|
|
return
|