Merge branch 'feature/eta1.9.7_range' into debug

models/chart_info_range_analysis.go

@@ -23,7 +23,16 @@ type ChartRangeAnalysisExtraConf struct {
 type ChartRangeAnalysisAutoDateChangeConf struct {
 	BaseDateType int `description:"基准日期类型：0指标日期，1系统日期"`
 	MoveForward  int `description:"前移的期数"`
-	DateChange   []*EdbDateConfDateChange
+	DateChange   []*EdbDataDateChangeConf
+}
+
+type EdbDataDateChangeConf struct {
+	Year         int
+	Month        int
+	Day          int
+	Frequency    string `description:"频度变换"`
+	FrequencyDay string `description:"频度的固定日期"`
+	ChangeType   int    `description:"日期变换类型1日期位移，2指定频率"`
 }
 
 type ChartRangeAnalysisDeleteDataConf struct {

services/data/range_analysis/chart_info.go

@@ -926,20 +926,21 @@ func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*m
 	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 []*models.EdbDateConfDateChange) (newDate string, err error) {
+func HandleEdbDateChange(date string, dateChange []*models.EdbDataDateChangeConf) (newDate string, err error) {
 	newDate = date
 	if newDate != "" {
 		if len(dateChange) > 0 {