|
@@ -2051,7 +2051,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
continue
|
|
|
}
|
|
|
// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
- chartLegend,_ := strconv.Atoi(v.ChartLegend)
|
|
|
+ chartLegend, _ := strconv.Atoi(v.ChartLegend)
|
|
|
if chartLegend < startYear {
|
|
|
continue
|
|
|
}
|
|
@@ -2187,7 +2187,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
continue
|
|
|
}
|
|
|
// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
- chartLegend,_ := strconv.Atoi(v.ChartLegend)
|
|
|
+ chartLegend, _ := strconv.Atoi(v.ChartLegend)
|
|
|
if chartLegend < startYear {
|
|
|
continue
|
|
|
}
|
|
@@ -2360,7 +2360,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
continue
|
|
|
}
|
|
|
// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
- chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
+ chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
if chartLegend < startYear {
|
|
|
continue
|
|
|
}
|
|
@@ -2431,7 +2431,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
valueMap := make(map[time.Time]float64)
|
|
|
|
|
|
samePeriodStandardDeviationList := make([]*models.MaxMinLimitsData, 0)
|
|
|
- for i := len(quarterDataList) - 1; i > len(quarterDataList)-seasonConfig.SamePeriodAverage.Year-1 && i > 0; i-- {
|
|
|
+ for i := len(quarterDataList) - 1; i > len(quarterDataList)-seasonConfig.SamePeriodStandardDeviation.Year-1 && i > 0; i-- {
|
|
|
// 插值成日度
|
|
|
dataTimeList, _, err = HandleDataByLinearRegressionToListV2(quarterDataList[i].DataList, handleDataMap)
|
|
|
if err != nil {
|
|
@@ -2448,7 +2448,7 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
continue
|
|
|
}
|
|
|
// 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
- chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
+ chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
if chartLegend < startYear {
|
|
|
continue
|
|
|
}
|