残差修复

models/edb_data_residual_analysis.go

@@ -199,46 +199,55 @@ func refreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 		if err != nil {
 			return err
 		}
+		for _, edbList := range mappingEdbList {
+			if edbList.EdbInfoId == 0 {
+				for _, edbData := range mappingEdbList[1].DataList {
+					value, _ := strconv.ParseFloat(edbData.Value, 64)
+					edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
+						EdbInfoId:     int(mapping.EdbInfoId),
+						EdbCode:       edbInfo.EdbCode,
+						DataTime:      edbData.DataTime,
+						Value:         value,
+						CreateTime:    time.Now(),
+						ModifyTime:    time.Now(),
+						DataTimeStamp: edbData.DataTimestamp,
+					})
+				}
 
-		for _, edbData := range mappingEdbList[1].DataList {
-			value, _ := strconv.ParseFloat(edbData.Value, 64)
-			edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
-				EdbInfoId:     int(mapping.EdbInfoId),
-				EdbCode:       edbInfo.EdbCode,
-				DataTime:      edbData.DataTime,
-				Value:         value,
-				CreateTime:    time.Now(),
-				ModifyTime:    time.Now(),
-				DataTimeStamp: edbData.DataTimestamp,
-			})
+				err = AddResidualAnalysisData(edbDataResidualAnalysisList)
+				if err != nil {
+					return err
+				}
+				break
+			}
 		}
 
-		err = AddResidualAnalysisData(edbDataResidualAnalysisList)
-		if err != nil {
-			return err
-		}
 	} else if mapping.IndexType == 2 {
 		edbInfo, err := GetEdbInfoById(int(mapping.EdbInfoId))
 		if err != nil {
 			return err
 		}
+		for _, edbList := range mappingEdbList {
+			if edbList.EdbInfoId == 0 {
+				for _, edbData := range residualEdbList[1].DataList {
+					value, _ := strconv.ParseFloat(edbData.Value, 64)
+					edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
+						EdbInfoId:     int(mapping.EdbInfoId),
+						EdbCode:       edbInfo.EdbCode,
+						DataTime:      edbData.DataTime,
+						Value:         value,
+						CreateTime:    time.Now(),
+						ModifyTime:    time.Now(),
+						DataTimeStamp: edbData.DataTimestamp,
+					})
+				}
 
-		for _, edbData := range residualEdbList[1].DataList {
-			value, _ := strconv.ParseFloat(edbData.Value, 64)
-			edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
-				EdbInfoId:     int(mapping.EdbInfoId),
-				EdbCode:       edbInfo.EdbCode,
-				DataTime:      edbData.DataTime,
-				Value:         value,
-				CreateTime:    time.Now(),
-				ModifyTime:    time.Now(),
-				DataTimeStamp: edbData.DataTimestamp,
-			})
-		}
-
-		err = AddResidualAnalysisData(edbDataResidualAnalysisList)
-		if err != nil {
-			return err
+				err = AddResidualAnalysisData(edbDataResidualAnalysisList)
+				if err != nil {
+					return err
+				}
+				break
+			}
 		}
 	}