Merge branch 'aj_chart_fix'

services/chart/chart_info.go

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