|
|
@@ -367,7 +367,7 @@ func RefreshAllPredictCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
edbInfoIdStr := strconv.Itoa(edbInfoId)
|
|
|
|
|
|
// 获取关联指标数据
|
|
|
- dataList, err := GetPredictEdbDataListAllByStartDate(fromEdbInfo, 0, startDate)
|
|
|
+ dataList, err := GetPredictEdbDataListAllByStartDate(fromEdbInfo, 1, startDate)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -625,8 +625,8 @@ func RefreshAllPredictCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
break
|
|
|
} else {
|
|
|
if i >= 1 {
|
|
|
- preDateDay = preDate.AddDate(0, 0, -i)
|
|
|
- preDateDayStr = nextDateDay.Format(utils.FormatDate)
|
|
|
+ preDateDay = preDateDay.AddDate(0, 0, -i)
|
|
|
+ preDateDayStr = preDateDay.Format(utils.FormatDate)
|
|
|
}
|
|
|
if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
|
|
|
timestamp := currentDate.UnixNano() / 1e6
|
