Parcourir la source

Merge branch 'fix/2022-12-05' into debug

Roc il y a 2 ans
Parent
commit
2e4be5a30b
1 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 3 1
      models/edb_info.go

+ 3 - 1
models/edb_info.go

@@ -591,7 +591,9 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleFinalValueHc(predictEdbConf.PredictEdbInfoId, finalValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
 		}
 		//startDate = dataEndTime.AddDate(0, 0, 1)
-		startDate = dataEndTime
+		if startDate.Before(dataEndTime) {
+			startDate = dataEndTime
+		}
 		if tmpMinValue < minValue {
 			minValue = tmpMinValue
 		}