|
|
@@ -539,13 +539,6 @@ func GetChartDataByEdbInfoList(chartInfoId int, dateType, startYear int, startDa
|
|
|
}
|
|
|
|
|
|
func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int, startDate, endDate string, edbInfoMappingList []*data_manage.ChartEdbInfoMapping, req *data_manage.ChartRangeAnalysisExtraConf) (edbList []*data_manage.ChartEdbInfoMapping, xEdbIdValue []int, dataResp data_manage.ChartRangeAnalysisDataResp, err error) {
|
|
|
- fmt.Println(chartInfoId)
|
|
|
- fmt.Println(dateType)
|
|
|
- fmt.Println(startYear)
|
|
|
- fmt.Println(startDate)
|
|
|
- fmt.Println(endDate)
|
|
|
- fmt.Println(edbInfoMappingList)
|
|
|
- fmt.Println(req)
|
|
|
//查询seriesId
|
|
|
chartSeriesOb := new(data_manage.FactorEdbSeriesChartMapping)
|
|
|
seriesMappingItem, err := chartSeriesOb.GetItemByChartInfoId(chartInfoId)
|
|
|
@@ -580,7 +573,6 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
|
|
|
edbInfoMapping.DataList = dataList
|
|
|
// 处理上下限
|
|
|
var maxData, minData float64
|
|
|
- fmt.Println("数据长度：", len(dataList))
|
|
|
if len(dataList) > 0 {
|
|
|
maxData = dataList[0].Value
|
|
|
minData = dataList[0].Value
|
|
|
@@ -653,9 +645,6 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if len(edbInfoMappingList) > 0 {
|
|
|
- fmt.Println("dataList Len:", edbInfoMappingList[0].DataList)
|
|
|
- }
|
|
|
dataResp = data_manage.ChartRangeAnalysisDataResp{ChartRangeAnalysisExtraConf: req, SeriesId: seriesMappingItem.FactorEdbSeriesId}
|
|
|
// 查询配置关联关系
|
|
|
if req.MultipleGraphConfigId > 0 {
|
