瀏覽代碼

fix:新增返回移动后的最新数据日期

Roc 1 年之前
父節點
當前提交
109f1de017
共有 2 個文件被更改,包括 11 次插入9 次删除
  1. 9 8
      models/tables/chart_edb_mapping/query.go
  2. 2 1
      services/chart/chart_info.go

+ 9 - 8
models/tables/chart_edb_mapping/query.go

@@ -40,14 +40,15 @@ type ChartEdbInfoMapping struct {
 	MinValue          float64   `json:"-" description:"最小值"`
 	MaxValue          float64   `json:"-" description:"最大值"`
 
-	EdbNameEn           string `description:"英文指标名称"`
-	FrequencyEn         string `description:"英文频率"`
-	UnitEn              string `description:"英文单位"`
-	EdbInfoCategoryType int    `description:"0:普通指标,1:预测指标"`
-	LeadUnitEn          string `description:"领先英文单位"`
-	PredictChartColor   string `description:"预测数据的颜色"`
-	ChartType           int    `description:"生成样式:1:曲线图,2:季节性图,3:面积图,4:柱状图,5:散点图,6:组合图"`
-	MappingSource       int    `description:"1:ETA图库;2:商品价格曲线"`
+	MoveLatestDate      time.Time `description:"移动后的数据最新日期"`
+	EdbNameEn           string    `description:"英文指标名称"`
+	FrequencyEn         string    `description:"英文频率"`
+	UnitEn              string    `description:"英文单位"`
+	EdbInfoCategoryType int       `description:"0:普通指标,1:预测指标"`
+	LeadUnitEn          string    `description:"领先英文单位"`
+	PredictChartColor   string    `description:"预测数据的颜色"`
+	ChartType           int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图,4:柱状图,5:散点图,6:组合图"`
+	MappingSource       int       `description:"1:ETA图库;2:商品价格曲线"`
 }
 
 type ChartEdbInfoMappingList struct {

+ 2 - 1
services/chart/chart_info.go

@@ -541,6 +541,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 		item.LatestValue = v.LatestValue
 		item.LatestDate = v.LatestDate
 		item.UniqueCode = v.UniqueCode
+		item.MoveLatestDate = item.LatestDate
 
 		var startDateReal string
 		var diffSeconds int64
@@ -577,7 +578,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 						err = tmpErr
 						return
 					}
-					item.LatestDate = v.LatestDate.AddDate(0, 0, day)
+					item.MoveLatestDate = v.MoveLatestDate.AddDate(0, 0, day)
 				}
 			} else {
 				startDateReal = startDate