瀏覽代碼

Merge branch 'hotfix/bug7634_season_chart' into debug

# Conflicts:
#	models/tables/edb_data/query.go
#	services/chart/chart_info.go
xyxie 1 月之前
父節點
當前提交
0c9b569874
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 2 3
      models/tables/edb_data/query.go
  2. 0 1
      services/chart/chart_info.go

+ 2 - 3
models/tables/edb_data/query.go

@@ -3,7 +3,6 @@ package edb_data
 import (
 	"errors"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
 	"hongze/hongze_yb/global"
 	"hongze/hongze_yb/models/mgo"
 	"hongze/hongze_yb/models/tables/chart_edb_mapping"
@@ -11,6 +10,8 @@ import (
 	"hongze/hongze_yb/utils"
 	"strconv"
 	"time"
+
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 // GetEdbDataTableName 指标数据->存储表
@@ -390,8 +391,6 @@ func getThsHfEdbDataListByMongo(source, subSource, edbInfoId int, startDate, end
 
 	return
 }
-
-
 // 自定义同期均线
 type SamePeriodAverageResp struct {
 	Color     string                   `description:"颜色"`

+ 0 - 1
services/chart/chart_info.go

@@ -2956,7 +2956,6 @@ func RadarChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edb
 	}
 	return
 }
-
 // HandleDataByLinearRegressionToList 插值法补充数据(线性方程式)
 func HandleDataByLinearRegressionToList(edbInfoDataList []*edbDataModel.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {