Browse Source

fix:考虑指标没有数据的情况

Roc 2 years ago
parent
commit
b44d920a65
1 changed files with 10 additions and 0 deletions
  1. 10 0
      services/data/chart_info.go

+ 10 - 0
services/data/chart_info.go

@@ -469,6 +469,11 @@ func BarChartData(mappingList []*models.ChartEdbInfoMapping, edbDataListMap map[
 		// 日期配置
 		barChartInfoDate := barChartInfoDateList[barChartInfoSort.DateIndex]
 		for edbInfoId, dataList := range edbDataListMap {
+			if len(dataList) <= 0 {
+				// 没有数据的指标id
+				notDataEdbIdList = append(notDataEdbIdList, edbInfoId)
+				continue
+			}
 			findDate := barChartInfoDate.Date
 			switch barChartInfoDate.Type {
 			case 1: //最新值
@@ -558,6 +563,11 @@ func BarChartData(mappingList []*models.ChartEdbInfoMapping, edbDataListMap map[
 		for _, edbInfoId := range edbIdList {
 			findDate := barChartInfoDate.Date     //需要的日期值
 			dataList := edbDataListMap[edbInfoId] //指标的所有数据值
+			if len(dataList) <= 0 {
+				// 没有数据的指标id
+				findDataList = append(findDataList, 0)
+				continue
+			}
 			switch barChartInfoDate.Type {
 			case 1: //最新值
 				dataList := edbDataListMap[edbInfoId]