Browse Source

fix:查询顺序调整

Roc 1 year ago
parent
commit
cf14c4a73a
1 changed files with 11 additions and 11 deletions
  1. 11 11
      controllers/data_manage/edb_info.go

+ 11 - 11
controllers/data_manage/edb_info.go

@@ -4109,18 +4109,18 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		startDate = date + "-01"
 		dateType = "month"
 	}
-	// 前面的数据
-	beforeList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, "", startDate, 1, num)
+
+	// 后面的数据
+	afterList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprint("获取面的指数据失败,Err:", err.Error())
+		br.ErrMsg = fmt.Sprint("获取面的指数据失败,Err:", err.Error())
 		return
 	}
 
 	// 当前日期
 	var currDate string
-
-	lenBeforeList := len(beforeList)
+	lenBeforeList := len(afterList)
 	if lenBeforeList <= 0 {
 		br.Ret = 200
 		br.Success = true
@@ -4131,12 +4131,12 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		var dateTimeStr string
 		switch dateType {
 		case "month":
-			dateTime, _ := time.ParseInLocation(utils.FormatDate, beforeList[lenBeforeList-1].DataTime, time.Local)
+			dateTime, _ := time.ParseInLocation(utils.FormatDate, afterList[0].DataTime, time.Local)
 			dateTimeStr = dateTime.Format(utils.FormatYearMonthDate)
 		case "day":
-			dateTimeStr = beforeList[lenBeforeList-1].DataTime
+			dateTimeStr = afterList[0].DataTime
 		}
-		currDate = beforeList[lenBeforeList-1].DataTime
+		currDate = afterList[0].DataTime
 		// 如果对应日期找不到,那么就直接返回吧
 		if dateTimeStr != date {
 			br.Ret = 200
@@ -4147,11 +4147,11 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		}
 	}
 
-	// 面的数据
-	afterList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
+	// 面的数据
+	beforeList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, "", currDate, 1, num)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprint("获取面的指数据失败,Err:", err.Error())
+		br.ErrMsg = fmt.Sprint("获取面的指数据失败,Err:", err.Error())
 		return
 	}