Roc 1 năm trước cách đây
mục cha
commit
95604725fc
2 tập tin đã thay đổi với 12 bổ sung5 xóa
  1. 11 4
      controllers/data_manage/edb_info.go
  2. 1 1
      services/data/edb_data.go

+ 11 - 4
controllers/data_manage/edb_info.go

@@ -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 {

+ 1 - 1
services/data/edb_data.go

@@ -388,7 +388,7 @@ func GetEdbBeforeAndAfterDateData(edbInfo *data_manage.EdbInfo, startDate, endDa
 			num = lenDataList - 1
 		}
 
-		for i := num; i > 0; i-- {
+		for i := num; i >= 0; i-- {
 			list = append(list, dataList[lenDataList-1-i])
 		}