|
|
@@ -13,7 +13,7 @@ import (
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
-// 将表格信息转化成指标数据
|
|
|
+// GetBalanceExcelData 将表格信息转化成指标数据
|
|
|
func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo, lang string) (newDataMap map[int]map[int]request.MixedTableCellDataReq, allRows, allCols int, err error, errMsg string) {
|
|
|
var result request.MixedTableReq
|
|
|
err = json.Unmarshal([]byte(excelDetail.Content), &result)
|
|
|
@@ -114,7 +114,7 @@ func GetBalanceExcelChartList(excelInfo *excelModel.ExcelInfo, lang string) (lis
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// 将表格信息转化成指标数据
|
|
|
+// GetBalanceExcelEdbData 将表格信息转化成指标数据
|
|
|
func GetBalanceExcelEdbData(excelEdbMappingItem *excelModel.ExcelChartEdb, newMixedTableCellDataListMap map[int]map[int]request.MixedTableCellDataReq, dataListMap map[int][]*data_manage.EdbDataList, allRows, allCols int) (err error, errMsg string) {
|
|
|
var dateList, dataList []string
|
|
|
// 日期序列
|
|
|
@@ -338,7 +338,7 @@ func GetBalanceExcelEdbData(excelEdbMappingItem *excelModel.ExcelChartEdb, newMi
|
|
|
// todo 处理DataTimestamp
|
|
|
dataTime, e := time.ParseInLocation(utils.FormatDate, v, time.Local)
|
|
|
if e != nil {
|
|
|
- err = errors.New("time.Parse Err:" + err.Error())
|
|
|
+ err = errors.New("time.Parse Err:" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
timestamp := dataTime.UnixNano() / 1e6
|
