Merge branch 'pool/581' into debug

models/data_manage/chart_info.go

@@ -439,6 +439,7 @@ type ChartEdbInfoMapping struct {
 	ChartType           int     `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
 	LatestDate          string  `description:"数据最新日期"`
 	LatestValue         float64 `description:"数据最新值"`
+	MoveLatestDate      string  `description:"移动后的数据最新日期"`
 	UniqueCode          string  `description:"指标唯一编码"`
 	MinValue            float64 `json:"-" description:"最小值"`
 	MaxValue            float64 `json:"-" description:"最大值"`

services/data/chart_info.go

@@ -202,6 +202,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 		item.LatestValue = v.LatestValue
 		item.LatestDate = v.LatestDate
 		item.UniqueCode = v.UniqueCode
+		item.MoveLatestDate = v.LatestDate
 
 		var startDateReal string
 		var diffSeconds int64
@@ -233,6 +234,21 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			} else {
 				startDateReal = startDate
 			}
+
+			// 预测指标的开始日期也要偏移
+			{
+				day, tmpErr := utils.GetDaysBetween2Date(utils.FormatDate, startDate, startDateReal)
+				if tmpErr != nil {
+					err = tmpErr
+					return
+				}
+				latestDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v.MoveLatestDate, time.Local)
+				if tmpErr != nil {
+					err = tmpErr
+					return
+				}
+				item.MoveLatestDate = latestDateTime.AddDate(0, 0, day).Format(utils.FormatDate)
+			}
 		}
 		//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		calendarPreYear := 0

services/data/correlation/chart_info.go

@@ -90,6 +90,13 @@ func HandleDataByLinearRegression(originList []*data_manage.EdbDataList, handleD
 			}
 		}
 
+		// 最后将自己赋值
+		newList = append(newList, &data_manage.EdbDataList{
+			EdbDataId: v.EdbDataId,
+			DataTime:  v.DataTime,
+			Value:     v.Value,
+		})
+
 		startEdbInfoData = v
 	}
 	return