|
@@ -776,6 +776,12 @@ func (obj BaseCalculate) DownFrequency() (dateDataMap map[time.Time]float64, err
|
|
|
edbFrequency := obj.Frequency
|
|
|
formula := obj.Formula.(string)
|
|
|
|
|
|
+ if !CheckFrequency(obj.FromFrequency, obj.Frequency) {
|
|
|
+ errMsg = "频度异常,不允许低频降频到高频"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
var dateArr []time.Time
|
|
|
dataMap := make(map[time.Time]*EdbInfoData)
|
|
@@ -1226,12 +1232,6 @@ func (obj BaseCalculate) Ljz() (dateDataMap map[time.Time]float64, err error, er
|
|
|
dataList := obj.DataList
|
|
|
frequency := obj.Frequency
|
|
|
fromFrequency := obj.FromFrequency
|
|
|
-
|
|
|
- if !CheckFrequency(obj.FromFrequency, obj.Frequency) {
|
|
|
- errMsg = "频度异常,不允许低频降频到高频"
|
|
|
- err = errors.New(errMsg)
|
|
|
- return
|
|
|
- }
|
|
|
|
|
|
var isWeekData bool
|
|
|
|