|
@@ -1662,7 +1662,14 @@ func (obj BaseCalculate) Rjz() (dateDataMap map[time.Time]float64, err error, er
|
|
|
|
|
|
fromFrequency := obj.FromFrequency
|
|
fromFrequency := obj.FromFrequency
|
|
if fromFrequency == `` {
|
|
if fromFrequency == `` {
|
|
- err = errors.New("错误的频度:" + fromFrequency)
|
|
+ errMsg = "原指标的频度不能为空"
|
|
|
|
+ err = errors.New(errMsg)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if obj.FromFrequency == "日度" {
|
|
|
|
+ errMsg = "日度指标无需进行日均值计算"
|
|
|
|
+ err = errors.New(errMsg)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|