..

services/data/chart_extra_config.go

@@ -399,12 +399,6 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 				err = fmt.Errorf("指标%d的日期数据不存在", edbInfoId)
 				return
 			}
-			/*dataList := edbDataListMap[edbInfoId] //指标的所有数据值
-			if len(dataList) <= 0 {
-				// 没有数据的指标id
-				//findDataList = append(findDataList, 0)
-				continue
-			}*/
 			//日期变换处理，判断用指标的最新日期还是，直接获取引用日期
 			var findDate string
 			if edbConf.DateConfType == 0 {
@@ -413,6 +407,10 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 					return
 				}
 				findDate, err = GetChartSectionSeriesDateByDateChange(edbInfoId, edbDataList, edbConf.DateConf.DateChange, edbConf.DateConf.MoveForward)
+				if err != nil {
+					err = fmt.Errorf("指标%d的日期变换处理失败", edbInfoId)
+					return
+				}
 			} else {
 				// 获取日期配置
 				dateConfItem, ok1 := DateConfListMap[edbConf.DateConfName]
@@ -431,6 +429,10 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 				}
 
 				findDate, err = GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
+				if err != nil {
+					err = fmt.Errorf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
+					return
+				}
 			}
 			findDateTime, _ := time.ParseInLocation(utils.FormatDate, findDate, time.Local)
 			if maxDate.IsZero() {