。。

models/edb_data_calculate_qjjs.go

@@ -40,10 +40,10 @@ type ChartRangeAnalysisAutoDateConf struct { //智能划分
 type ChartRangeAnalysisAutoDateChangeConf struct {
 	BaseDateType int `description:"基准日期类型：0指标日期，1系统日期，2固定日期"`
 	MoveForward  int `description:"前移的期数"`
-	DateChange   []*EdbDateConfDateChange
+	DateChange   []*EdbDataDateChangeConf
 }
 
-type EdbDateConfDateChange struct {
+type EdbDataDateChangeConf struct {
 	Year         int
 	Month        int
 	Day          int
@@ -906,20 +906,21 @@ func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*E
 	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
 }
 
 // HandleEdbDateChange 处理日期变换
-func HandleEdbDateChange(date string, dateChange []*EdbDateConfDateChange) (newDate string, err error) {
+func HandleEdbDateChange(date string, dateChange []*EdbDataDateChangeConf) (newDate string, err error) {
 	newDate = date
 	if newDate != "" {
 		if len(dateChange) > 0 {