fix:数据格式化

controllers/excel_info.go

@@ -113,7 +113,7 @@ func (this *ExcelInfoController) GetTableDetail() {
 		newResult, tmpErr, _ := table.GetMixedTableCellData(result)
 		if tmpErr != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取最新的数据失败，Err:" + err.Error()
+			br.ErrMsg = "获取最新的数据失败，Err:" + tmpErr.Error()
 			return
 		}
 		tableData, err = excel.GetTableDataByMixedTableData(newResult)

models/chart.go

@@ -144,6 +144,14 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 	return
 }
 
+type EdbDataItemList struct {
+	EdbDataId     int     `json:"-" description:" 指标数据ID"`
+	EdbInfoId     int     `json:"-" description:"指标ID"`
+	DataTime      string  `description:"数据日期"`
+	DataTimestamp int64   `description:"数据日期"`
+	Value         float64 `description:"数据值"`
+}
+
 type EdbDataItems struct {
 	Items                []*EdbDataList
 	Year                 int

services/data/table/mixed_table.go

@@ -20,7 +20,7 @@ import (
 // BaseCalculate
 // @Description: 指标数据计算请求
 type BaseCalculate struct {
-	DataList      []*models.EdbDataList
+	DataList      []models.EdbDataItemList
 	Frequency     string `description:"需要转换的频度"`
 	Formula       interface{}
 	Calendar      string `description:"公历/农历"`
@@ -75,7 +75,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 	// 月度指标数据map
 	edbMonthDataListMap := make(map[int]map[string]float64)
 	// 日度指标数据map
-	edbDataListMap := make(map[int][]*models.EdbDataList)
+	edbDataListMap := make(map[int][]models.EdbDataItemList)
 	for _, edbInfo := range edbInfoList {
 		edbInfoMap[edbInfo.EdbInfoId] = edbInfo
 
@@ -102,7 +102,18 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 		}
 		edbDayDataListMap[edbInfo.EdbInfoId] = dateValMap
 		edbMonthDataListMap[edbInfo.EdbInfoId] = monthValMap
-		edbDataListMap[edbInfo.EdbInfoId] = dataList
+
+		tmpDataList := make([]models.EdbDataItemList, 0)
+		for _, v := range dataList {
+			tmpDataList = append(tmpDataList, models.EdbDataItemList{
+				EdbDataId:     v.EdbDataId,
+				EdbInfoId:     v.EdbInfoId,
+				DataTime:      v.DataTime,
+				DataTimestamp: v.DataTimestamp,
+				Value:         v.Value,
+			})
+		}
+		edbDataListMap[edbInfo.EdbInfoId] = tmpDataList
 	}
 
 	// 单元格实际绑定的信息map