Merge remote-tracking branch 'origin/11.3'

services/data/chart_info.go

@@ -291,11 +291,14 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		dataList := make([]*models.EdbDataList, 0)
 		//fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 
+		var newEdbInfo *data_manage.EdbInfo
 		switch v.EdbInfoCategoryType {
 		case 0:
 			dataList, err = models.GetEdbDataList(v.Source, v.EdbInfoId, startDateReal, endDate)
 		case 1:
-			dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(v.EdbInfoId, startDateReal, endDate, false)
+			newEdbInfo, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(v.EdbInfoId, startDateReal, endDate, false)
+			item.MaxData = newEdbInfo.MaxValue
+			item.MinData = newEdbInfo.MinValue
 		default:
 			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.EdbInfoCategoryType))
 		}

services/data/predict_edb_info.go

@@ -86,13 +86,14 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayLi
 }
 
 // GetPredictDataListByPredictEdbInfoId 根据预测指标id获取预测指标的数据
-func GetPredictDataListByPredictEdbInfoId(edbInfoId int, startDate, endDate string, isTimeBetween bool) (dataList []*models.EdbDataList, sourceEdbInfoItem *data_manage.EdbInfo, predictEdbConf *data_manage.PredictEdbConf, err error, errMsg string) {
-	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
+func GetPredictDataListByPredictEdbInfoId(edbInfoId int, startDate, endDate string, isTimeBetween bool) (edbInfo *data_manage.EdbInfo, dataList []*models.EdbDataList, sourceEdbInfoItem *data_manage.EdbInfo, predictEdbConf *data_manage.PredictEdbConf, err error, errMsg string) {
+	edbInfo, err = data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
 		errMsg = `获取预测指标信息失败`
 		return
 	}
-	return GetPredictDataListByPredictEdbInfo(edbInfo, startDate, endDate, isTimeBetween)
+	dataList, sourceEdbInfoItem, predictEdbConf, err, errMsg = GetPredictDataListByPredictEdbInfo(edbInfo, startDate, endDate, isTimeBetween)
+	return
 }
 
 // GetPredictDataListByPredictEdbInfo 根据预测指标信息获取预测指标的数据