Browse Source

Merge branch 'pool/321' into debug

Roc 1 year ago
parent
commit
26ca1f4977
1 changed files with 15 additions and 0 deletions
  1. 15 0
      services/chart/chart_info.go

+ 15 - 0
services/chart/chart_info.go

@@ -575,6 +575,21 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 					startDateReal = startDate
 					diffSeconds = 0
 				}
+
+				// 预测指标的开始日期也要偏移
+				{
+					day, tmpErr := utils.GetDaysBetween2Date(utils.FormatDate, startDateReal, startDate)
+					if tmpErr != nil {
+						err = tmpErr
+						return
+					}
+					latestDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
+					if tmpErr != nil {
+						err = tmpErr
+						return
+					}
+					v.LatestDate = latestDateTime.AddDate(0, 0, day).Format(utils.FormatDate)
+				}
 			} else {
 				startDateReal = startDate
 			}