fix:调整

controllers/data_manage/edb_info.go

@@ -4083,28 +4083,43 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		br.ErrMsg = fmt.Sprint("获取指标信息失败,Err:", err.Error())
 		return
 	}
+	dataList := make([]*data_manage.EdbDataList, 0)
+
 	startDate := date
+	// 是否指定到日的日期
+	isDayDate := true
 	//如果填写的是月度日期
 	if strings.Count(date, "-") == 1 {
 		startDate = date + "-01"
+		isDayDate = false
 	}
 	// 前面的数据
 	beforeList, err := data.GetEdbBeforeAndAfterDateData(edbInfo, "", startDate, 1, num)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprint("获取指数据失败,Err:", err.Error())
+		br.ErrMsg = fmt.Sprint("获取前面的指数据失败,Err:", err.Error())
 		return
 	}
+
+	lenBeforeList := len(beforeList)
+	if isDayDate && lenBeforeList > 0 {
+		if beforeList[lenBeforeList-1].DataTime != startDate {
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "所选指标所选日期无值"
+			br.Data = dataList
+			return
+		}
+	}
+
 	// 后面的数据
 	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
 	}
 
-	dataList := make([]*data_manage.EdbDataList, 0)
-
 	dataList = append(dataList, beforeList...)
 	// 后面的数据
 	if len(afterList) > 0 {

services/data/predict_edb_info.go

@@ -952,7 +952,7 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *data_manage.EdbInfo, startDate,
 
 	endDateStr := edbInfo.EndDate //预测指标的结束日期
 
-	if isTimeBetween { //如果是时间区间，那么
+	if isTimeBetween && endDate != `` { //如果是时间区间，同时截止日期不为空的情况，那么
 		reqEndDateTime, _ := time.ParseInLocation(utils.FormatDate, endDate, time.Local)
 		endDateTime, _ := time.ParseInLocation(utils.FormatDate, edbInfo.EndDate, time.Local)
 		// 如果选择的时间区间结束日期 晚于 当天，那么预测数据截止到当天