kobe6258 4 日 前
コミット
0e8e85e2f2
1 ファイル変更5 行追加3 行削除
  1. 5 3
      models/edb_data_residual_analysis.go

+ 5 - 3
models/edb_data_residual_analysis.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"math"
 	"sort"
@@ -222,7 +223,7 @@ func refreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 			return err
 		}
 
-		for _, edbData := range residualEdbList[0].DataList {
+		for _, edbData := range residualEdbList[1].DataList {
 			value, _ := strconv.ParseFloat(edbData.Value, 64)
 			edbDataResidualAnalysisList = append(edbDataResidualAnalysisList, edbDataResidualAnalysis{
 				EdbInfoId:     int(mapping.EdbInfoId),
@@ -257,9 +258,10 @@ func fillResidualChartInfo(config ResidualAnalysisConfig, req *EdbInfo, edbInfoM
 	dataAList := edbInfoA.DataList
 	edbData := make([]*EdbDataList, len(dataAList))
 	for i, data := range dataAList {
-		f, _ := strconv.ParseFloat(data.Value, 64)
+		//f, _ := strconv.ParseFloat(data.Value, 64)
+		f, _ := decimal.NewFromString(data.Value)
 		edbData[i] = &EdbDataList{
-			Value:         f,
+			Value:         f.InexactFloat64(),
 			DataTimestamp: data.DataTimestamp,
 			DataTime:      data.DataTime,
 			EdbInfoId:     data.EdbInfoId,