Browse Source

季节性图表数据

xyxie 9 tháng trước cách đây
mục cha
commit
142b54a1f2
1 tập tin đã thay đổi với 26 bổ sung15 xóa
  1. 26 15
      services/data/chart_info_excel_balance.go

+ 26 - 15
services/data/chart_info_excel_balance.go

@@ -599,6 +599,15 @@ func GetBalanceExcelChartDetail(chartInfo *data_manage.ChartInfoView, mappingLis
 	mappingList := make([]*data_manage.ChartEdbInfoMapping, 0)
 	//循环组装映射关系
 	for _, v := range mappingListTmp {
+		dataList := make([]*data_manage.EdbDataList, 0)
+		dataListTmp, ok := dataListMap[v.ExcelChartEdbId]
+		if ok {
+			dataList = dataListTmp
+		} else {
+			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.ExcelChartEdbId))
+			return
+		}
+		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
 		mapping := &data_manage.ChartEdbInfoMapping{
 			EdbInfoId:         v.ExcelChartEdbId,
 			SourceName:        "",
@@ -614,8 +623,8 @@ func GetBalanceExcelChartDetail(chartInfo *data_manage.ChartInfoView, mappingLis
 			FrequencyEn:       "",
 			Unit:              "",
 			UnitEn:            "",
-			StartDate:         "",
-			EndDate:           "",
+			StartDate:         startDateStr,
+			EndDate:           endDateStr,
 			ModifyTime:        v.ModifyTime.Format(utils.FormatDateTime),
 			ChartEdbMappingId: v.ExcelChartEdbId,
 			ChartInfoId:       chartInfoId,
@@ -632,13 +641,13 @@ func GetBalanceExcelChartDetail(chartInfo *data_manage.ChartInfoView, mappingLis
 			ChartColor:        "",
 			PredictChartColor: "",
 			ChartWidth:        0,
-			ChartType:         0,
-			LatestDate:        "",
-			LatestValue:       0,
+			ChartType:         chartType,
+			LatestDate:        endDateStr,
+			LatestValue:       endVal,
 			MoveLatestDate:    "",
 			UniqueCode:        "",
-			MinValue:          0,
-			MaxValue:          0,
+			MinValue:          minValue,
+			MaxValue:          maxValue,
 			DataList:          nil,
 			IsNullData:        false,
 			MappingSource:     0,
@@ -1173,7 +1182,7 @@ func GetBalanceExcelSeasonChartLegendPreview(dataList []*data_manage.EdbDataList
 		seasonExtraConfig = string(seasonExtra)
 	}
 	var latestDate time.Time //最新日期
-	startDate, endDate, _, _ := getBalanceDataListStartDateAndValue(dataList)
+	startDate, endDate, _, _, _, _ := getBalanceDataListStartDateAndValue(dataList)
 	calendarPreYear := 0
 	startDateReal := startDate
 	latestDate, _ = time.ParseInLocation(utils.FormatDate, endDate, time.Local)
@@ -1213,12 +1222,14 @@ func GetBalanceExcelSeasonChartLegendPreview(dataList []*data_manage.EdbDataList
 	return
 }
 
-func getBalanceDataListStartDateAndValue(dataList []*data_manage.EdbDataList) (startDate, endDate string, startVal, endVal float64) {
+func getBalanceDataListStartDateAndValue(dataList []*data_manage.EdbDataList) (startDate, endDate string, startVal, endVal, maxVal, minVal float64) {
 	if len(dataList) == 0 {
 		return
 	}
 	startDate = dataList[0].DataTime
 	startVal = dataList[0].Value
+	maxVal = dataList[0].Value
+	minVal = dataList[0].Value
 	endDate = dataList[len(dataList)-1].DataTime
 	endVal = dataList[len(dataList)-1].Value
 	for _, v := range dataList {
@@ -1230,6 +1241,12 @@ func getBalanceDataListStartDateAndValue(dataList []*data_manage.EdbDataList) (s
 			endDate = v.DataTime
 			endVal = v.Value
 		}
+		if v.Value > maxVal {
+			maxVal = v.Value
+		}
+		if v.Value < minVal {
+			minVal = v.Value
+		}
 	}
 	return
 }
@@ -1512,9 +1529,3 @@ func copyBalanceExcelChart(oldChartInfo *data_manage.ChartInfoView, sysUserId in
 
 	return
 }
-
-// HandleBalanceExcelContentToStatic 将动态表的内容转化为静态表
-func HandleBalanceExcelContentToStatic(oldContent string) (content string, err error) {
-
-	return
-}