Merge branch 'pool/581' into debug

models/chart.go

@@ -85,6 +85,7 @@ type ChartEdbInfoMapping struct {
 	ChartType           int     `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图"`
 	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

@@ -200,6 +200,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
@@ -236,12 +237,12 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 						err = tmpErr
 						return
 					}
-					latestDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
+					latestDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v.MoveLatestDate, time.Local)
 					if tmpErr != nil {
 						err = tmpErr
 						return
 					}
-					item.LatestDate = latestDateTime.AddDate(0, 0, day).Format(utils.FormatDate)
+					item.MoveLatestDate = latestDateTime.AddDate(0, 0, day).Format(utils.FormatDate)
 				}
 			} else {
 				startDateReal = startDate

services/data/correlation/chart_info.go

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