Эх сурвалжийг харах

Merge branch 'pool/321' into pool/581

Roc 1 жил өмнө
parent
commit
5caf22a410

+ 10 - 0
services/chart/chart_info.go

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