Browse Source

fix:拟合残差结果序列计算B-B'时用未变频的因变量(指标B)进行计算,得到时间序列与未变频的因变量(指标B)一致的拟合残差结果序列,并且频度与因变量(指标B)一致;

Roc 2 years ago
parent
commit
b08a82d92d
1 changed files with 5 additions and 4 deletions
  1. 5 4
      models/edb_data_calculate_nhcc.go

+ 5 - 4
models/edb_data_calculate_nhcc.go

@@ -447,6 +447,7 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 
 	//第二个指标
 	bDataList := make([]EdbInfoSearchData, 0)
+	secondDataList := make([]*EdbInfoSearchData, 0)
 	bDataMap := make(map[string]float64)
 	{
 		condition = ``
@@ -456,9 +457,9 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 		pars = append(pars, existItemB.FromEdbInfoId)
 
 		//第二个指标的数据列表
-		secondDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
-		if tmpErr != nil {
-			return tmpErr
+		secondDataList, err = GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
+		if err != nil {
+			return
 		}
 		bDataList, bDataMap = handleNhccData(secondDataList, existItemB.MoveValue)
 	}
@@ -541,7 +542,7 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 	}
 
 	// Delta=B-B‘
-	for _, bData := range bDataList {
+	for _, bData := range secondDataList {
 		currDate := bData.DataTime
 		//校验待删除日期数据里面是否存在该元素,如果存在的话,那么移除该元素
 		if _, ok := removeDataTimeMap[currDate]; ok {