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