|
@@ -58,7 +58,7 @@ func CalculateByRuleBy9(to orm.TxOrmer, rule CalculateRule) (resultDataList []*E
|
|
|
|
|
|
formulaStr := strings.ToUpper(rule.Formula)
|
|
|
// 获取关联指标数据
|
|
|
- for _, v := range rule.EdbInfoList {
|
|
|
+ for edbInfoIndex, v := range rule.EdbInfoList {
|
|
|
dataList, tmpErr := GetPredictEdbDataListAll(v, 1)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
@@ -66,7 +66,7 @@ func CalculateByRuleBy9(to orm.TxOrmer, rule CalculateRule) (resultDataList []*E
|
|
|
}
|
|
|
|
|
|
//lenData := len(dataList)
|
|
|
- for edbInfoIndex, dv := range dataList {
|
|
|
+ for _, dv := range dataList {
|
|
|
// 现有实际数据
|
|
|
if val, ok := realSaveDataMap[dv.DataTime]; ok {
|
|
|
if _, ok := val[v.EdbInfoId]; !ok {
|