Selaa lähdekoodia

兼容历史数据

xyxie 1 vuosi sitten
vanhempi
commit
2324b78a93
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 1 1
      models/chart.go
  2. 3 1
      services/data/chart_info.go

+ 1 - 1
models/chart.go

@@ -156,7 +156,7 @@ type EdbDataResult struct {
 }
 
 type QuarterData struct {
-	Year                 int
+	Year                 string
 	DataList             []*EdbDataList
 	CuttingDataTimestamp int64 `description:"切割的时间戳"`
 	ChartLegend          string

+ 3 - 1
services/data/chart_info.go

@@ -473,6 +473,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*models.EdbDataList, latestDateS
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le
 		}
+		quarterItem.Year = quarterItem.ChartLegend
 		quarterItem.DataList = itemList
 		quarterItem.CuttingDataTimestamp = v.CuttingDataTimestamp
 
@@ -659,6 +660,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *models.EdbDataResult, latestDat
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le
 		}
+		quarterItem.Year = quarterItem.ChartLegend
 		quarterItem.DataList = itemList
 		quarterItem.CuttingDataTimestamp = v.CuttingDataTimestamp
 
@@ -675,7 +677,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *models.EdbDataResult, latestDat
 	if result.List[0].Year != calendarPreYear || jumpYear == 1 {
 		itemList := make([]*models.EdbDataList, 0)
 		items := new(models.QuarterData)
-		//items.Year = calendarPreYear
+		//items.Year = calendarPreYear
 		items.DataList = itemList
 
 		newResult := make([]*models.QuarterData, 0)