|
|
@@ -224,6 +224,21 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
startDateReal = startDate
|
|
|
diffSeconds = 0
|
|
|
}
|
|
|
+
|
|
|
+ // 预测指标的开始日期也要偏移
|
|
|
+ {
|
|
|
+ day, tmpErr := utils.GetDaysBetween2Date(utils.FormatDate, startDate, startDateReal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, item.LatestDate, time.Local)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ item.LatestDate = latestDateTime.AddDate(0, 0, day).Format(utils.FormatDate)
|
|
|
+ }
|
|
|
} else {
|
|
|
startDateReal = startDate
|
|
|
}
|
|
|
@@ -571,6 +586,7 @@ func BarChartData(mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap
|
|
|
}
|
|
|
}
|
|
|
if tmpValue, ok := edbDataMap[edbInfoId][findDate]; ok {
|
|
|
+ tmpValue, _ = decimal.NewFromFloat(tmpValue).Round(4).Float64()
|
|
|
findDataList = append(findDataList, tmpValue)
|
|
|
} else {
|
|
|
findDataList = append(findDataList, 0)
|
