|
|
@@ -8,7 +8,6 @@ import (
|
|
|
"github.com/beego/beego/v2/client/orm"
|
|
|
"github.com/shopspring/decimal"
|
|
|
"math"
|
|
|
- "sort"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -904,22 +903,20 @@ func GetRangeAnalysisChartDataByEdbInfo(fromEdbInfo *EdbInfo, calculateFormula R
|
|
|
func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*EdbInfoSearchData) (date string) {
|
|
|
// 根据日期进行排序
|
|
|
index := 0
|
|
|
- // 倒序处理
|
|
|
- // 把正序的指标改成倒序
|
|
|
- var dataList SortEdbDataList
|
|
|
- dataList = edbDataList
|
|
|
- sort.Sort(dataList)
|
|
|
- for _, v := range dataList {
|
|
|
- if v.DataTime == startDate {
|
|
|
+ length := len(edbDataList)
|
|
|
+ for i := length - 1; i >= 0; i-- {
|
|
|
+ item := edbDataList[i]
|
|
|
+ if item.DataTime == startDate {
|
|
|
index += 1
|
|
|
continue
|
|
|
}
|
|
|
if index >= moveForward {
|
|
|
- date = v.DataTime
|
|
|
+ date = item.DataTime
|
|
|
break
|
|
|
}
|
|
|
if index > 0 {
|
|
|
index += 1
|
|
|
+ date = item.DataTime
|
|
|
}
|
|
|
}
|
|
|
return
|
