Explorar o código

残差分析 指标刷新

gmy hai 2 meses
pai
achega
b2eb5e9a48
Modificáronse 1 ficheiros con 11 adicións e 6 borrados
  1. 11 6
      models/edb_data_residual_analysis.go

+ 11 - 6
models/edb_data_residual_analysis.go

@@ -159,15 +159,15 @@ func refreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 	// 残差图表信息
 	residualEdbList, _, err := fillResidualChartInfo(config, fromEdbInfo, edbInfoMappingA, edbInfoMappingB, mappingEdbList)
 
-	edbInfo, err := GetEdbInfoById(edbInfoId)
-	if err != nil {
-		return err
-	}
-
 	// 映射指标 与 残差指标 同步刷新
 	for _, mapping := range configMapping {
 		var edbDataResidualAnalysisList []edbDataResidualAnalysis
 		if mapping.IndexType == 1 {
+			edbInfo, err := GetEdbInfoById(int(mapping.EdbInfoId))
+			if err != nil {
+				return err
+			}
+
 			for _, edbData := range mappingEdbList[1].DataList {
 				value, _ := strconv.ParseFloat(edbData.Value, 64)
 				edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
@@ -186,11 +186,16 @@ func refreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 				return err
 			}
 		} else if mapping.IndexType == 2 {
+			edbInfo, err := GetEdbInfoById(int(mapping.EdbInfoId))
+			if err != nil {
+				return err
+			}
+
 			for _, edbData := range residualEdbList[1].DataList {
 				value, _ := strconv.ParseFloat(edbData.Value, 64)
 				edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
 					EdbInfoId:     int(mapping.EdbInfoId),
-					EdbCode:       edbData.EdbCode,
+					EdbCode:       edbInfo.EdbCode,
 					DataTime:      edbData.DataTime,
 					Value:         value,
 					CreateTime:    time.Now(),