Roc 1 year ago
parent
commit
7ef8059917
2 changed files with 23 additions and 2 deletions
  1. 17 2
      controllers/data_manage/edb_info.go
  2. 6 0
      models/data_manage/edb_info.go

+ 17 - 2
controllers/data_manage/edb_info.go

@@ -4117,8 +4117,17 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		return
 	}
 
+	// 当前日期
+	var currDate string
+
 	lenBeforeList := len(beforeList)
-	if lenBeforeList <= 0 || beforeList[lenBeforeList-1].DataTime != startDate {
+	if lenBeforeList <= 0 {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "所选指标所选日期无值"
+		br.Data = dataList
+		return
+	} else {
 		var dateTimeStr string
 		switch dateType {
 		case "month":
@@ -4127,6 +4136,7 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		case "day":
 			dateTimeStr = beforeList[lenBeforeList-1].DataTime
 		}
+		currDate = beforeList[lenBeforeList-1].DataTime
 		// 如果对应日期找不到,那么就直接返回吧
 		if dateTimeStr != date {
 			br.Ret = 200
@@ -4160,8 +4170,13 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		dataList[i], dataList[j] = dataList[j], dataList[i]
 	}
 
+	resp := data_manage.BeforeAndAfterDateDataResp{
+		List: dataList,
+		Date: currDate,
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = dataList
+	br.Data = resp
 }

+ 6 - 0
models/data_manage/edb_info.go

@@ -1756,3 +1756,9 @@ type TraceEdbInfoResp struct {
 	ClassifyId  int                `description:"分类ID"`
 	Child       []TraceEdbInfoResp `description:"下级来源"`
 }
+
+// BeforeAndAfterDateDataResp 前后几期数据
+type BeforeAndAfterDateDataResp struct {
+	List []*EdbDataList `description:"list"`
+	Date string         `description:"实际日期"`
+}