Преглед на файлове

数据源指标导出bug

xyxie преди 4 месеца
родител
ревизия
7553882346
променени са 3 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      models/data_manage/base_from_fenwei.go
  2. 1 1
      models/data_manage/base_from_ly_data.go
  3. 1 1
      models/data_manage/base_from_rzd_data.go

+ 1 - 1
models/data_manage/base_from_fenwei.go

@@ -242,7 +242,7 @@ func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenwei
 
 // GetFenWeiDataListByIndexCodes 根据指标编码查询
 func GetFenWeiDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+	sql := ` SELECT DISTINCT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  ORDER BY data_time DESC `
 	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
 	return
 }

+ 1 - 1
models/data_manage/base_from_ly_data.go

@@ -58,7 +58,7 @@ func GetBaseFromLyDataByIndexCode(indexCode string) (items []*BaseFromLyData, er
 }
 
 func GetLyDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_ly_data WHERE index_code IN(` + IndexCodes + `)  ORDER BY data_time DESC `
+	sql := ` SELECT DISTINCT data_time FROM base_from_ly_data WHERE index_code IN(` + IndexCodes + `)  ORDER BY data_time DESC `
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Raw(sql).Find(&items).Error
 	return

+ 1 - 1
models/data_manage/base_from_rzd_data.go

@@ -104,7 +104,7 @@ func GetBaseFormRzdDataByCondition(condition string, pars []interface{}) (items
 
 // GetRzdDataListByIndexCodes 根据指标编码查询
 func GetRzdDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+	sql := ` SELECT DISTINCT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  ORDER BY data_time DESC `
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Raw(sql).Find(&items).Error
 	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {