|
@@ -154,22 +154,25 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*ch
|
|
|
if lenData <= 0 {
|
|
|
continue
|
|
|
}
|
|
|
+ // 数据的开始索引
|
|
|
+ k := lenData - 1
|
|
|
+
|
|
|
+ // 数据的最晚日期
|
|
|
+ dataEndDateStr := dataList[k].DataTime
|
|
|
+ dataEndDate, tmpErr := time.ParseInLocation(utils.FormatDate, dataEndDateStr, time.Local)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
// 数据开始日期
|
|
|
endDateStr := ``
|
|
|
var endDate time.Time
|
|
|
- // 数据的开始索引
|
|
|
- k := lenData - 1
|
|
|
var currVal float64
|
|
|
switch dateConfig.DateType {
|
|
|
case 1: // 1:最新日期;
|
|
|
- endDateStr = dataList[k].DataTime
|
|
|
- tmpDate, tmpErr := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
|
|
|
- if tmpErr != nil {
|
|
|
- err = tmpErr
|
|
|
- return
|
|
|
- }
|
|
|
- endDate = tmpDate
|
|
|
+ endDateStr = dataEndDateStr
|
|
|
+ endDate = dataEndDate
|
|
|
currVal = dataList[k].Value
|
|
|
case 2: // 2:N天前
|
|
|
tmpEndDate := currDay.AddDate(0, 0, -dateConfig.Num)
|
|
@@ -181,6 +184,7 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*ch
|
|
|
if tmpEndDateStr == tmpDateStr {
|
|
|
k = i
|
|
|
endDateStr = tmpDateStr
|
|
|
+ endDate = tmpEndDate
|
|
|
currVal = dataList[i].Value
|
|
|
break
|
|
|
}
|