滚动期数，时间问题

services/data/range_analysis/chart_info.go

@@ -61,7 +61,7 @@ func GetAutoCalculateDateDataList(currentDate string, dataList []*data_manage.Ed
 		// 根据日期，获取数据
 		for _, vv := range dataList {
 			dataTimeT, _ := time.ParseInLocation(utils.FormatDate, vv.DataTime, time.Local)
-			if dataTimeT.After(calStartTime) && dataTimeT.Before(calEndTime) ||
+			if (dataTimeT.After(calStartTime) && dataTimeT.Before(calEndTime)) ||
 				dataTimeT.Equal(calStartTime) ||
 				dataTimeT.Equal(calEndTime) {
 				newDataList = append(newDataList, vv)
@@ -1830,14 +1830,15 @@ func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*d
 	for _, v := range edbDataList {
 		if v.DataTime == startDate {
 			index += 1
+			continue
 		}
-		if index > 0 {
-			index += 1
-		}
-		if index == moveForward {
+		if index >= moveForward {
 			date = v.DataTime
 			break
 		}
+		if index > 0 {
+			index += 1
+		}
 	}
 	return
 }