|
@@ -4089,14 +4089,14 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
|
|
|
startDate = date + "-01"
|
|
|
}
|
|
|
// 前面的数据
|
|
|
- tmpList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, "", startDate, 1, num)
|
|
|
+ beforeList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, "", startDate, 1, num)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = fmt.Sprint("获取指数据失败,Err:", err.Error())
|
|
|
return
|
|
|
}
|
|
|
// 后面的数据
|
|
|
- tmpList2, err := data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
|
|
|
+ afterList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = fmt.Sprint("获取指数据失败,Err:", err.Error())
|
|
@@ -4105,8 +4105,15 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
|
|
|
|
|
|
dataList := make([]*data_manage.EdbDataList, 0)
|
|
|
|
|
|
- dataList = append(dataList, tmpList...)
|
|
|
- dataList = append(dataList, tmpList2...)
|
|
|
+ dataList = append(dataList, beforeList...)
|
|
|
+ // 后面的数据
|
|
|
+ if len(afterList) > 0 {
|
|
|
+ if len(beforeList) > 0 {
|
|
|
+ dataList = append(dataList, afterList[1:]...)
|
|
|
+ } else {
|
|
|
+ dataList = append(dataList, afterList...)
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// 数据翻转
|
|
|
for i, j := 0, len(dataList)-1; i < j; i, j = i+1, j-1 {
|