|
|
@@ -39,7 +39,8 @@ func GetAutoCalculateDateDataList(currentDate string, dataList []*data_manage.Ed
|
|
|
startDate = time.Now().Format(utils.FormatDate)
|
|
|
}
|
|
|
if startConf.MoveForward > 0 {
|
|
|
- startDate = GetEdbDateByMoveForward(startDate, startConf.MoveForward, dataList)
|
|
|
+ endDateTmp := dataList[len(dataList)-1].DataTime
|
|
|
+ startDate = GetEdbDateByMoveForward(endDateTmp, startConf.MoveForward, dataList)
|
|
|
}
|
|
|
if len(startConf.DateChange) > 0 {
|
|
|
startDate, err = HandleEdbDateChange(startDate, startConf.DateChange)
|
|
|
@@ -1842,7 +1843,7 @@ func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*d
|
|
|
var dataList data_manage.SortEdbDataList
|
|
|
dataList = edbDataList
|
|
|
sort.Sort(dataList)
|
|
|
- for _, v := range dataList {
|
|
|
+ for _, v := range edbDataList {
|
|
|
if v.DataTime == startDate {
|
|
|
index += 1
|
|
|
continue
|
