fix:兼容原有的数据获取逻辑，不通过日期获取最近5期数据

controllers/data_manage/edb_info.go

@@ -4160,17 +4160,23 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		br.IsSendEmail = false
 		return
 	}
-	if date == `` {
-		br.Msg = "请选择日期"
-		br.IsSendEmail = false
-		return
-	}
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = fmt.Sprint("获取指标信息失败,Err:", err.Error())
 		return
 	}
+
+	// 当前日期
+	var currDate string
+	// 是否查找之后的数据
+	isFindAfter := true
+	if date == `` {
+		currDate = edbInfo.EndDate
+		isFindAfter = false
+		num-- //减去最后一期的数据，获取前面的几期数据
+	}
+
 	dataList := make([]*data_manage.EdbDataList, 0)
 
 	startDate := date
@@ -4183,39 +4189,40 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 	}
 
 	// 后面的数据
-	afterList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprint("获取后面的指数据失败,Err:", err.Error())
-		return
-	}
-
-	// 当前日期
-	var currDate string
-	lenBeforeList := len(afterList)
-	if lenBeforeList <= 0 {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "所选指标所选日期无值"
-		br.Data = dataList
-		return
-	} else {
-		var dateTimeStr string
-		switch dateType {
-		case "month":
-			dateTime, _ := time.ParseInLocation(utils.FormatDate, afterList[0].DataTime, time.Local)
-			dateTimeStr = dateTime.Format(utils.FormatYearMonthDate)
-		case "day":
-			dateTimeStr = afterList[0].DataTime
+	afterList := make([]*data_manage.EdbDataList, 0)
+	if isFindAfter {
+		afterList, err = data.GetEdbBeforeAndAfterDateData(edbInfo, startDate, "", 2, num)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprint("获取后面的指数据失败,Err:", err.Error())
+			return
 		}
-		currDate = afterList[0].DataTime
-		// 如果对应日期找不到，那么就直接返回吧
-		if dateTimeStr != date {
+
+		lenBeforeList := len(afterList)
+		if lenBeforeList <= 0 {
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "所选指标所选日期无值"
 			br.Data = dataList
 			return
+		} else {
+			var dateTimeStr string
+			switch dateType {
+			case "month":
+				dateTime, _ := time.ParseInLocation(utils.FormatDate, afterList[0].DataTime, time.Local)
+				dateTimeStr = dateTime.Format(utils.FormatYearMonthDate)
+			case "day":
+				dateTimeStr = afterList[0].DataTime
+			}
+			currDate = afterList[0].DataTime
+			// 如果对应日期找不到，那么就直接返回吧
+			if dateTimeStr != date {
+				br.Ret = 200
+				br.Success = true
+				br.Msg = "所选指标所选日期无值"
+				br.Data = dataList
+				return
+			}
 		}
 	}
 
@@ -4324,7 +4331,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
 			if v1 == depList[k].RealName && v1 != "" {
 				item := &company.DepartmentGroupAdmins{
 					AdminId:  "group_" + strconv.Itoa(k),
-					RealName: strings.Replace(k1,v1,"",-1),
+					RealName: strings.Replace(k1, v1, "", -1),
 				}
 				depList[k].ChildrenList = append(depList[k].ChildrenList, item)
 			}

models/data_manage/excel/request/excel_info.go

@@ -137,10 +137,11 @@ type MixedTableReq struct {
 
 // MixedTableCellDataReq 混合表格单元格参数
 type MixedTableCellDataReq struct {
-	Uid       string `description:"单元格唯一标识"`
-	DataType  int    `description:"数据类型，1：日期，2：指标，3：自定义文本，4：插值"`
-	DataTime  string `description:"所属日期"`
-	EdbInfoId int    `description:"指标id"`
-	ShowValue string `description:"展示值"`
-	Value     string `description:"实际值"`
+	Uid          string `description:"单元格唯一标识"`
+	DataType     int    `description:"数据类型，1：日期，2：指标，3：自定义文本，4：插值"`
+	DataTime     string `description:"所属日期"`
+	DataTimeType int    `description:"日期类型：0：手动输入日期；1：导入系统日期；2：导入系统日期计算后的日期；3：导入系统日期相关的指定日期；4：导入指标日期（指标库的最新日期）；"`
+	EdbInfoId    int    `description:"指标id"`
+	ShowValue    string `description:"展示值"`
+	Value        string `description:"实际值"`
 }

utils/config.go

@@ -124,8 +124,9 @@ var (
 
 // 对象存储客户端
 var (
-	ObjectStorageClient string       // 目前有oss minio，默认oss
+	ObjectStorageClient string // 目前有oss minio，默认oss
 )
+
 // 阿里云配置
 var (
 	Bucketname       string
@@ -249,7 +250,7 @@ func init() {
 	}
 	Rc, Re = cache.NewCache(REDIS_CACHE) //初始化缓存
 	if Re != nil {
-		fmt.Println(Re)
+		fmt.Println("redis链接异常：", Re)
 		panic(any(Re))
 	}