Browse Source

fix:时间序列表格

Roc 11 months ago
parent
commit
418bd19ca8

+ 3 - 3
controllers/data_manage/excel/excel_info.go

@@ -134,7 +134,7 @@ func (c *ExcelInfoController) Add() {
 	// 引用的指标id
 	edbInfoIdList := make([]int, 0)
 	// 自定义表格
-	if req.Source == 2 {
+	if req.Source == utils.TIME_TABLE {
 		jsonStrByte, err := json.Marshal(req.TableData)
 		if err != nil {
 			br.Msg = "自定义表格数据获取失败"
@@ -1296,7 +1296,7 @@ func (c *ExcelInfoController) GetExcelTableData() {
 			br.ErrMsg = "获取最新的表格数据失败,Err:" + err.Error()
 			return
 		}
-		tableData, err = excel.GetTableDataByCustomData(excelInfo.ExcelType, result)
+		tableData, err = excel.GetTableDataByCustomData(excelInfo.ExcelType, result, c.Lang)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "转换成table失败,Err:" + err.Error()
@@ -2085,7 +2085,7 @@ func (c *ExcelInfoController) Download() {
 			br.ErrMsg = "获取最新的表格数据失败,Err:" + err.Error()
 			return
 		}
-		tableData, err = excel.GetTableDataByCustomData(excelInfo.ExcelType, result)
+		tableData, err = excel.GetTableDataByCustomData(excelInfo.ExcelType, result, c.Lang)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "转换成table失败,Err:" + err.Error()

+ 21 - 4
models/data_manage/chart_info.go

@@ -1179,14 +1179,31 @@ func EditChartBaseInfoAndEdbEnInfo(req *EditChartInfoBaseReq, chartItem *ChartIn
 			return err
 		}
 		if count > 0 {
+			msql := ` UPDATE edb_info SET modify_time = NOW() `
+			pars := make([]interface{}, 0)
 			switch lang {
 			case utils.EnLangVersion:
-				msql := ` UPDATE edb_info SET edb_name_en =?,unit_en = ?,modify_time = NOW() WHERE edb_info_id = ? `
-				_, err = to.Raw(msql, v.EdbName, v.Unit, v.EdbInfoId).Exec()
+				msql += ` ,edb_name_en = ? `
+				pars = append(pars, v.EdbName)
+
+				// 如果有传单位
+				if v.Unit != `` {
+					msql += ` ,unit_en = ? `
+					pars = append(pars, v.Unit)
+				}
 			default:
-				msql := ` UPDATE edb_info SET edb_name =?,unit = ?,modify_time = NOW() WHERE edb_info_id = ? `
-				_, err = to.Raw(msql, v.EdbName, v.Unit, v.EdbInfoId).Exec()
+				msql += ` ,edb_name = ? `
+				pars = append(pars, v.EdbName)
+
+				// 如果有传单位
+				if v.Unit != `` {
+					msql += ` ,unit = ? `
+					pars = append(pars, v.Unit)
+				}
 			}
+			msql += ` WHERE edb_info_id = ? `
+			pars = append(pars, v.EdbInfoId)
+			_, err = to.Raw(msql, pars...).Exec()
 			if err != nil {
 				fmt.Println("edb_info Err:" + err.Error())
 				return err

+ 2 - 0
models/data_manage/excel/request/excel_info.go

@@ -100,9 +100,11 @@ type EdbInfoData struct {
 	EdbInfoId        int             `description:"指标ID"`
 	Tag              string          `description:"标签"`
 	EdbName          string          `description:"指标名称"`
+	EdbNameEn        string          `description:"英文指标名称"`
 	EdbAliasName     string          `description:"指标别名"`
 	Frequency        string          `description:"频度"`
 	Unit             string          `description:"单位"`
+	UnitEn           string          `description:"英文单位"`
 	ClassifyId       int             `description:"所属分类" json:"-"`
 	IsJoinPermission int             `description:"是否加入权限管控,0:不加入;1:加入;默认:0" json:"-"`
 	HaveOperaAuth    bool            `description:"是否有数据权限,默认:false"`

+ 0 - 906
services/data/excel/excel_info.go

@@ -12,11 +12,7 @@ import (
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/shopspring/decimal"
-	"github.com/yidane/formula"
 	"sort"
-	"strconv"
-	"strings"
 	"time"
 )
 
@@ -434,908 +430,6 @@ func GetFirstHistoryEdbDataList(edbInfo *data_manage.EdbInfo, num int, endDate s
 	return
 }
 
-type TableDataConfig struct {
-	EdbInfoIdList    []int                     `description:"指标id列表,从左至右,从上到下的顺序"`
-	Sort             int                       `description:"日期排序,0:倒序,1:正序"`
-	Data             []ManualData              `description:"数据列表"`
-	Num              int                       `description:"实际数据需要列出来的期数"`
-	RemoveDate       []string                  `description:"不展示的日期"`
-	ManualDate       []string                  `description:"手动配置的日期(未来的日期)"`
-	TableEdbInfoList []TableEdbInfo            `description:"表格内指标信息"`
-	TextRowData      [][]request.ManualDataReq `description:"文本列表"`
-}
-
-type TableEdbInfo struct {
-	EdbInfoId    int    `description:"指标ID"`
-	Tag          string `description:"标签"`
-	EdbName      string `description:"指标名称"`
-	EdbAliasName string `description:"指标别名"`
-	Frequency    string `description:"频度"`
-	Unit         string `description:"单位"`
-}
-
-type ManualData struct {
-	DataType            int                       `description:"数据类型,1:普通的,2:插值法,3:手动输入,4:公式计算"`
-	DataTime            string                    `description:"所属日期"`
-	DataTimeType        int                       `description:"日期类型,1:实际日期;2:未来日期"`
-	ShowValue           string                    `description:"展示值"`
-	Value               string                    `description:"实际值(计算公式)"`
-	EdbInfoId           int                       `description:"指标id"`
-	Tag                 string                    `description:"下标"`
-	RelationEdbInfoList []request.RelationEdbInfo `description:"关联指标(计算公式中关联的指标,用于计算的时候去匹配)"`
-}
-
-// GetTableDataConfig 根据TableDataReq配置获取相关数据配置
-func GetTableDataConfig(reqData request.TableDataReq) (tableDataConfig TableDataConfig, err error) {
-	// 指标数据
-	tableDataConfig.EdbInfoIdList = reqData.EdbInfoIdList
-	tableDataConfig.Sort = reqData.Sort
-
-	if len(reqData.Data) <= 0 {
-		err = errors.New("数据不能为空")
-		return
-	}
-
-	// 开始日期
-	var startDate string
-	// A列的指标id
-	var firstEdbInfoId int
-	// 手工操作的数据列
-	manualDataList := make([]ManualData, 0)
-	// 指标配置列表
-	tableEdbInfoList := make([]TableEdbInfo, 0)
-
-	// 第一列的日期map
-	firstDateMap := make(map[string]string)
-	manualDateMap := make(map[string]string)
-
-	for _, v := range reqData.Data {
-		// 指标信息
-		tmpTableEdbInfo := TableEdbInfo{
-			EdbInfoId:    v.EdbInfoId,
-			Tag:          v.Tag,
-			EdbName:      v.EdbName,
-			EdbAliasName: v.EdbAliasName,
-			Frequency:    v.Frequency,
-			Unit:         v.Unit,
-		}
-		tableEdbInfoList = append(tableEdbInfoList, tmpTableEdbInfo)
-
-		// 确定数据A列
-		if v.Tag == "A" {
-			firstEdbInfoId = v.EdbInfoId
-			lenData := len(v.Data)
-			if lenData <= 0 {
-				err = errors.New("A列不能为空")
-				return
-			}
-			index := 0
-			if reqData.Sort == 1 {
-				// 倒序
-				index = lenData - 1
-			}
-
-			startDate = v.Data[index].DataTime
-
-			// 存在的日期列表
-			for _, data := range v.Data {
-				firstDateMap[data.DataTime] = data.DataTime
-
-				if data.DataTimeType == 2 {
-					manualDateMap[data.DataTime] = data.DataTime
-				}
-			}
-		}
-
-		for _, data := range v.Data {
-			if data.DataType == 3 || data.DataType == 4 {
-				tmpManualData := ManualData{
-					DataType:            data.DataType,
-					DataTime:            data.DataTime,
-					DataTimeType:        data.DataTimeType,
-					ShowValue:           data.ShowValue,
-					Value:               data.Value,
-					EdbInfoId:           v.EdbInfoId,
-					Tag:                 v.Tag,
-					RelationEdbInfoList: data.RelationEdbInfoList,
-				}
-				if data.DataType == 4 {
-					tmpManualData.ShowValue = ``
-				}
-				manualDataList = append(manualDataList, tmpManualData)
-			}
-		}
-	}
-
-	// 总共需要的期数
-	num := len(reqData.Data[0].Data)
-
-	removeDate := make([]string, 0)
-
-	// 获取期数
-	{
-		firstDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		edbInfo, tmpErr := data_manage.GetEdbInfoById(firstEdbInfoId)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		var firstDataList []*data_manage.EdbDataList
-		switch edbInfo.EdbInfoType {
-		case 0:
-			firstDataList, err = data_manage.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
-		case 1:
-			_, firstDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
-		default:
-			err = errors.New(fmt.Sprint("获取失败,指标类型异常", edbInfo.EdbInfoType))
-		}
-		if err != nil {
-			return
-		}
-
-		// 获取日期内的数据(包含开始日期前一个日期,以及 结束日期后一个日期,目的为了做空日期时的 插值法兼容)
-		baseDataList := make([]*data_manage.EdbDataList, 0)
-		for _, data := range firstDataList {
-			tmpDate := data.DataTime
-			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, tmpDate, time.Local)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			if tmpDateTime.Before(firstDateTime) {
-				continue
-			}
-			baseDataList = append(baseDataList, data)
-		}
-
-		// 筛选出需要删除的日期
-		for _, tmpData := range baseDataList {
-			//firstDateMap{}
-			if _, ok := firstDateMap[tmpData.DataTime]; !ok {
-				removeDate = append(removeDate, tmpData.DataTime)
-			}
-		}
-	}
-
-	tableDataConfig.Num = num
-	tableDataConfig.RemoveDate = removeDate
-	tableDataConfig.Data = manualDataList
-	tableDataConfig.TableEdbInfoList = tableEdbInfoList
-	tableDataConfig.TextRowData = reqData.TextRowData
-
-	return
-}
-
-// GetDataByTableDataConfig 根据数据配置获取表格数据
-func GetDataByTableDataConfig(tableDataConfig TableDataConfig) (resultResp request.TableDataReq, err error) {
-	// 没有选择指标的情况下,直接返回吧
-	if len(tableDataConfig.EdbInfoIdList) <= 0 {
-		return
-	}
-
-	// 实际期数没有的情况下,直接返回吧
-	if tableDataConfig.Num <= 0 {
-		return
-	}
-
-	// 获取所有的指标信息
-	edbInfoMap := make(map[int]*data_manage.EdbInfo)
-	edbInfoIdList := make([]int, 0)
-	// 标签与指标id的map
-	tagEdbInfoIdMap := make(map[string]int)
-	{
-		for _, tableEdbInfo := range tableDataConfig.TableEdbInfoList {
-			edbInfoIdList = append(edbInfoIdList, tableEdbInfo.EdbInfoId)
-			tagEdbInfoIdMap[tableEdbInfo.Tag] = tableEdbInfo.EdbInfoId
-		}
-		edbInfoList, tmpErr := data_manage.GetEdbInfoByIdList(edbInfoIdList)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		for _, v := range edbInfoList {
-			edbInfoMap[v.EdbInfoId] = v
-		}
-	}
-
-	manualDateMap := make(map[string]string, 0)
-	manualDateList := make([]string, 0)
-	for _, v := range tableDataConfig.Data {
-		if _, ok := manualDateMap[v.DataTime]; !ok {
-			manualDateMap[v.DataTime] = v.DataTime
-			manualDateList = append(manualDateList, v.DataTime)
-		}
-	}
-
-	// 寻找A列的数据列表
-	firstEdbInfo, ok := edbInfoMap[tableDataConfig.TableEdbInfoList[0].EdbInfoId]
-	if !ok {
-		err = errors.New("找不到A列指标")
-		return
-	}
-	baseFirstEdbInfoDataList, err := GetFirstEdbDataList(firstEdbInfo, tableDataConfig.Num, manualDateList)
-	if err != nil {
-		return
-	}
-	// A列找不到数据,那么就直接返回吧
-	if len(baseFirstEdbInfoDataList) <= 0 {
-		return
-	}
-
-	firstEdbInfoDataList := make([]request.ManualDataReq, 0)
-	if tableDataConfig.RemoveDate != nil && len(tableDataConfig.RemoveDate) > 0 {
-		for _, v := range baseFirstEdbInfoDataList {
-			if utils.InArrayByStr(tableDataConfig.RemoveDate, v.DataTime) {
-				continue
-			}
-			firstEdbInfoDataList = append(firstEdbInfoDataList, v)
-		}
-	} else {
-		firstEdbInfoDataList = baseFirstEdbInfoDataList
-	}
-	if len(firstEdbInfoDataList) <= 0 {
-		return
-	}
-	// 实际数据的最后一天
-	lastRealDateTime, err := time.ParseInLocation(utils.FormatDate, firstEdbInfoDataList[0].DataTime, time.Local)
-	if err != nil {
-		return
-	}
-
-	dateMap := make(map[string]string)
-	dateList := make([]string, 0)
-	edbInfoIdDateDataMap := make(map[int]map[string]request.ManualDataReq)
-	firstDateDataMap := make(map[string]request.ManualDataReq)
-	for _, v := range firstEdbInfoDataList {
-		dateList = append(dateList, v.DataTime)
-		dateMap[v.DataTime] = v.DataTime
-		firstDateDataMap[v.DataTime] = v
-	}
-
-	// 将手工数据的日期填补进去(未来的日期,过去的就不管了)
-	for _, manualData := range tableDataConfig.Data {
-		if !utils.InArrayByStr(dateList, manualData.DataTime) {
-			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, manualData.DataTime, time.Local)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			if tmpDateTime.After(lastRealDateTime) {
-				dateList = append(dateList, manualData.DataTime)
-			}
-		}
-	}
-
-	edbInfoIdDateDataMap[firstEdbInfo.EdbInfoId] = firstDateDataMap
-
-	for k, edbInfoId := range tableDataConfig.EdbInfoIdList {
-		if k == 0 {
-			continue
-		}
-
-		tmpEdbInfo, ok := edbInfoMap[edbInfoId]
-		if !ok {
-			err = errors.New("找不到A列指标")
-			return
-		}
-		otherDataList, tmpErr := GetOtherEdbDataList(tmpEdbInfo, dateList)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		tmpDateDataMap := make(map[string]request.ManualDataReq)
-		for _, v := range otherDataList {
-			tmpDateDataMap[v.DataTime] = v
-		}
-		edbInfoIdDateDataMap[tmpEdbInfo.EdbInfoId] = tmpDateDataMap
-	}
-
-	for _, v := range tableDataConfig.Data {
-		tmpDate := v.DataTime
-		if _, ok := dateMap[tmpDate]; !ok {
-			dateMap[v.DataTime] = tmpDate
-		}
-
-		edbInfoIdDateData, ok := edbInfoIdDateDataMap[v.EdbInfoId]
-		if !ok {
-			edbInfoIdDateData = make(map[string]request.ManualDataReq)
-		}
-
-		// 判断是否存在该日期的数据(不存在,那么插入数据吧,存在就不管了)
-		tmpManualData, ok := edbInfoIdDateData[tmpDate]
-		if !ok {
-			edbInfoIdDateData[tmpDate] = request.ManualDataReq{
-				DataType:  v.DataType,
-				DataTime:  v.DataTime,
-				ShowValue: v.ShowValue,
-				Value:     v.Value,
-			}
-		} else {
-			if (tmpManualData.DataType == 3 || tmpManualData.DataType == 4) && tmpManualData.ShowValue == `` {
-				tmpManualData.DataType = v.DataType
-				tmpManualData.ShowValue = v.ShowValue
-				tmpManualData.Value = v.Value
-				tmpManualData.RelationEdbInfoList = v.RelationEdbInfoList
-
-				edbInfoIdDateData[tmpDate] = tmpManualData
-			}
-		}
-		edbInfoIdDateDataMap[v.EdbInfoId] = edbInfoIdDateData
-	}
-
-	// 获取数据的日期排序
-	sortDateTimeList := make([]time.Time, 0)
-	{
-		sortDateList := dateList
-		if tableDataConfig.Sort == 1 {
-			baseDateList := utils.StrArr{}
-			baseDateList = append(baseDateList, sortDateList...)
-			sort.Sort(baseDateList)
-			sortDateList = append([]string{}, baseDateList...)
-		} else {
-			sort.Strings(sortDateList)
-		}
-		for _, v := range sortDateList {
-			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v, time.Local)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			sortDateTimeList = append(sortDateTimeList, tmpDateTime)
-		}
-	}
-
-	// 数据处理,处理成表格的数据格式
-	tableDataMap, textRowListDataResp := handleTable(tagEdbInfoIdMap, lastRealDateTime, sortDateTimeList, edbInfoIdDateDataMap, tableDataConfig.Data, tableDataConfig.TextRowData)
-
-	data := make([]request.EdbInfoData, 0)
-	for _, tableEdbInfo := range tableDataConfig.TableEdbInfoList {
-		tagEdbInfoIdMap[tableEdbInfo.Tag] = tableEdbInfo.EdbInfoId
-
-		manualDataReqList := make([]request.ManualDataReq, 0)
-		tmpEdbInfoData := request.EdbInfoData{
-			EdbInfoId:    tableEdbInfo.EdbInfoId,
-			Tag:          tableEdbInfo.Tag,
-			EdbName:      tableEdbInfo.EdbName,
-			EdbAliasName: tableEdbInfo.EdbAliasName,
-			Frequency:    tableEdbInfo.Frequency,
-			Unit:         tableEdbInfo.Unit,
-			Data:         manualDataReqList,
-		}
-
-		edbInfo, ok := edbInfoMap[tableEdbInfo.EdbInfoId]
-		if ok {
-			tmpEdbInfoData.EdbName = edbInfo.EdbName
-			tmpEdbInfoData.Frequency = edbInfo.Frequency
-			tmpEdbInfoData.Unit = edbInfo.Unit
-			tmpEdbInfoData.ClassifyId = edbInfo.ClassifyId
-			tmpEdbInfoData.IsJoinPermission = edbInfo.IsJoinPermission
-		}
-
-		for index, dateTime := range sortDateTimeList {
-			dataTimeType := 1
-			if dateTime.After(lastRealDateTime) {
-				dataTimeType = 2
-			}
-			tmpDateTimeStr := dateTime.Format(utils.FormatDate)
-
-			rowData, ok := tableDataMap[index+1]
-			if !ok {
-				manualDataReqList = append(manualDataReqList, request.ManualDataReq{
-					DataType:            3,
-					DataTime:            tmpDateTimeStr,
-					DataTimeType:        dataTimeType,
-					ShowValue:           "",
-					Value:               "",
-					RelationEdbInfoList: nil,
-				})
-				continue
-			}
-
-			tmpData, ok := rowData[tableEdbInfo.Tag]
-			if !ok {
-				manualDataReqList = append(manualDataReqList, request.ManualDataReq{
-					DataType:            3,
-					DataTime:            tmpDateTimeStr,
-					DataTimeType:        dataTimeType,
-					ShowValue:           "",
-					Value:               "",
-					RelationEdbInfoList: nil,
-				})
-				continue
-			}
-
-			tmpData.DataTimeType = dataTimeType
-			manualDataReqList = append(manualDataReqList, tmpData)
-		}
-
-		tmpEdbInfoData.Data = manualDataReqList
-
-		data = append(data, tmpEdbInfoData)
-	}
-
-	// 处理一下数据格式
-	for _, d := range data {
-		for k2, d2 := range d.Data {
-			// 可能有ShowValue非数值, 转换一下报错则continue
-			vf, e := strconv.ParseFloat(d2.ShowValue, 64)
-			if e != nil {
-				continue
-			}
-			d.Data[k2].ShowValue = utils.FormatTableDataShowValue(vf)
-		}
-	}
-	for _, d := range textRowListDataResp {
-		for k2, d2 := range d {
-			// 可能有ShowValue非数值, 转换一下报错则continue
-			vf, e := strconv.ParseFloat(d2.ShowValue, 64)
-			if e != nil {
-				continue
-			}
-			d[k2].ShowValue = utils.FormatTableDataShowValue(vf)
-		}
-	}
-
-	resultResp = request.TableDataReq{
-		EdbInfoIdList: edbInfoIdList,
-		Sort:          tableDataConfig.Sort,
-		TextRowData:   textRowListDataResp,
-		Data:          data,
-	}
-
-	return
-}
-
-// handleTable 表格数据处理
-func handleTable(tagEdbInfoIdMap map[string]int, lastRealDateTime time.Time, sortDateTimeList []time.Time, edbInfoIdDateDataMap map[int]map[string]request.ManualDataReq, manualDataList []ManualData, textRowData [][]request.ManualDataReq) (tableDataMap map[int]map[string]request.ManualDataReq, textRowListDataResp [][]request.ManualDataReq) {
-	tagList := make([]string, 0)
-	for tag, _ := range tagEdbInfoIdMap {
-		tagList = append(tagList, tag)
-	}
-	sort.Strings(tagList)
-
-	tableDataMap = make(map[int]map[string]request.ManualDataReq) //行、列数据
-
-	// 日期与行的关系
-	dateIndexMap := make(map[string]int)
-
-	for k, dateTime := range sortDateTimeList {
-		rowDataMap := make(map[string]request.ManualDataReq)
-
-		dataTimeType := 1
-		if dateTime.After(lastRealDateTime) {
-			dataTimeType = 2
-		}
-
-		tmpDateTimeStr := dateTime.Format(utils.FormatDate)
-		dateIndexMap[tmpDateTimeStr] = k + 1
-
-		for _, tag := range tagList {
-			edbInfoId, ok := tagEdbInfoIdMap[tag]
-			if !ok { // 没有找到该指标的映射关系,那么就用空串填补
-				rowDataMap[tag] = request.ManualDataReq{
-					DataType:            3,
-					DataTime:            tmpDateTimeStr,
-					DataTimeType:        dataTimeType,
-					ShowValue:           "",
-					Value:               "",
-					RelationEdbInfoList: nil,
-				}
-				continue
-			}
-
-			// 获取指标的数据map
-			dateDataMap, ok := edbInfoIdDateDataMap[edbInfoId]
-			if !ok { // 没有找到该指标的数据,那么就用空串填补
-				rowDataMap[tag] = request.ManualDataReq{
-					DataType:            3,
-					DataTime:            tmpDateTimeStr,
-					DataTimeType:        dataTimeType,
-					ShowValue:           "",
-					Value:               "",
-					RelationEdbInfoList: nil,
-				}
-				continue
-			}
-
-			// 获取指标该日期的数据
-			tmpData, ok := dateDataMap[tmpDateTimeStr]
-			if !ok { // 该指标没有找到对应日期的数据,那么就用空串填补
-				rowDataMap[tag] = request.ManualDataReq{
-					DataType:            3,
-					DataTime:            tmpDateTimeStr,
-					DataTimeType:        dataTimeType,
-					ShowValue:           "",
-					Value:               "",
-					RelationEdbInfoList: nil,
-				}
-				continue
-			}
-			tmpData.DataTimeType = dataTimeType
-			rowDataMap[tag] = tmpData
-		}
-		tableDataMap[k+1] = rowDataMap
-	}
-
-	// 替换手工设置的数据
-	for _, manualData := range manualDataList {
-		// 找不到该日期,说明这日期过期了,不处理
-		index, ok := dateIndexMap[manualData.DataTime]
-		if !ok {
-			continue
-		}
-
-		// 获取对应行的数据
-		rowDataMap, ok := tableDataMap[index]
-		if !ok {
-			continue
-		}
-
-		// 找到对应的单元格
-		tmpData, ok := rowDataMap[manualData.Tag]
-		if !ok {
-			continue
-		}
-
-		// 如果该单元格实际有数据(包含预测值),或者插值法补充了数据的话,那么就不用手动填入的数据
-		if utils.InArrayByInt([]int{1, 2, 5}, tmpData.DataType) {
-			continue
-		}
-
-		// 手工填写的数字
-		if tmpData.DataType == 3 {
-			tmpData.ShowValue = manualData.ShowValue
-			tmpData.Value = manualData.Value
-			tableDataMap[index][manualData.Tag] = tmpData
-
-			//edbInfoIdDateDataMap[manualData.EdbInfoId][manualData.DataTime] = tmpData
-			continue
-		}
-
-		// 公式
-		tmpData.DataType = manualData.DataType
-		tmpData.ShowValue = ``
-		tmpData.Value = manualData.Value
-		tmpData.RelationEdbInfoList = manualData.RelationEdbInfoList
-		tableDataMap[index][manualData.Tag] = tmpData
-
-	}
-
-	// 文本行的列表插入
-	lenTableData := len(tableDataMap)
-
-	// 文本行第一列的数据列表(可能多行)
-	firstColTextRowList := make([]request.ManualDataReq, 0)
-	// 参与计算的文本行列表数据
-	tmpTextRowList := make([][]request.ManualDataReq, 0)
-	for k, textRowList := range textRowData {
-		// 判断列数是否匹配,不匹配的话那么过滤
-		if len(tagList)+1 != len(textRowList) {
-			continue
-		}
-		rowDataMap := make(map[string]request.ManualDataReq)
-		tmpTextRow := make([]request.ManualDataReq, 0)
-		for index, textRow := range textRowList {
-			// 移除第一列,因为第一列是日期列
-			if index == 0 {
-				firstColTextRowList = append(firstColTextRowList, textRow)
-				continue
-			}
-			rowDataMap[tagList[index-1]] = textRow
-			tmpTextRow = append(tmpTextRow, textRow)
-		}
-
-		tableDataMap[lenTableData+k+1] = rowDataMap
-		tmpTextRowList = append(tmpTextRowList, tmpTextRow)
-	}
-
-	// 参与计算的单元格
-	calculateCellMap := make(map[string]string)
-
-	// 计算手工填写的单元格
-	for _, manualData := range manualDataList {
-		// 找不到该日期,说明这日期过期了,不处理
-		index, ok := dateIndexMap[manualData.DataTime]
-		if !ok {
-			continue
-		}
-
-		// 获取对应行的数据
-		rowDataMap, ok := tableDataMap[index]
-		if !ok {
-			continue
-		}
-
-		// 找到对应的单元格
-		colData, ok := rowDataMap[manualData.Tag]
-		if !ok {
-			continue
-		}
-
-		// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
-		if colData.DataType != 4 {
-			continue
-		}
-
-		tagMap := make(map[string]float64)
-		lenRelation := len(colData.RelationEdbInfoList)
-		replaceNum := 0
-		for _, relation := range colData.RelationEdbInfoList {
-			relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
-			valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
-			if tmpErr != nil {
-				continue
-			}
-			tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
-			if tmpErr != nil {
-				continue
-			}
-			tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
-			replaceNum++
-		}
-
-		// 如果替换的数据与关联的不一致,那么就退出当前循环
-		if lenRelation != replaceNum {
-			continue
-		}
-
-		// 计算
-		val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
-		// 计算失败,退出循环
-		if err != nil {
-			continue
-		}
-		// 重新赋值
-		colData.ShowValue = val
-		tableDataMap[index][manualData.Tag] = colData
-
-	}
-
-	// 计算文本行的单元格
-	for k, textRow := range tmpTextRowList {
-		// 获取对应行的数据
-		index := lenTableData + k + 1
-		rowDataMap, ok := tableDataMap[index]
-		if !ok {
-			continue
-		}
-
-		for colIndex, _ := range textRow {
-			currTag := tagList[colIndex]
-			// 找到对应的单元格
-			colData, ok := rowDataMap[currTag]
-			if !ok {
-				continue
-			}
-
-			// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
-			if colData.DataType != 4 {
-				continue
-			}
-
-			tagMap := make(map[string]float64)
-			lenRelation := len(colData.RelationEdbInfoList)
-			replaceNum := 0
-			for _, relation := range colData.RelationEdbInfoList {
-				relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
-				valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
-				if tmpErr != nil {
-					continue
-				}
-				tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
-				if tmpErr != nil {
-					continue
-				}
-				tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
-				replaceNum++
-			}
-
-			// 如果替换的数据与关联的不一致,那么就退出当前循环
-			if lenRelation != replaceNum {
-				continue
-			}
-
-			// 计算
-			val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
-			// 计算失败,退出循环
-			if err != nil {
-				continue
-			}
-			// 重新赋值
-			colData.ShowValue = val
-			tableDataMap[index][currTag] = colData
-		}
-
-	}
-
-	// 计算文本行第一列的数据值(多行)
-	for k, colData := range firstColTextRowList {
-		// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
-		if colData.DataType != 4 {
-			continue
-		}
-
-		tagMap := make(map[string]float64)
-		lenRelation := len(colData.RelationEdbInfoList)
-		replaceNum := 0
-		for _, relation := range colData.RelationEdbInfoList {
-			relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
-			valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
-			if tmpErr != nil {
-				continue
-			}
-			tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
-			if tmpErr != nil {
-				continue
-			}
-			tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
-			replaceNum++
-		}
-
-		// 如果替换的数据与关联的不一致,那么就退出当前循环
-		if lenRelation != replaceNum {
-			continue
-		}
-
-		// 计算
-		val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
-		// 计算失败,退出循环
-		if err != nil {
-			continue
-		}
-		// 重新赋值
-		colData.ShowValue = val
-		firstColTextRowList[k] = colData
-	}
-
-	{
-		// 文本行的数据处理返回
-		textRowListDataResp = make([][]request.ManualDataReq, 0)
-		newLenTableDataMap := len(tableDataMap)
-		// 文本行的第一行所在的位置
-		firstTextRow := lenTableData + 1
-		for i := firstTextRow; i <= newLenTableDataMap; i++ {
-			textRowDataResp := make([]request.ManualDataReq, 0)
-
-			textRowDataResp = append(textRowDataResp, firstColTextRowList[i-firstTextRow])
-			for _, tmpTag := range tagList {
-				textRowDataResp = append(textRowDataResp, tableDataMap[i][tmpTag])
-			}
-			textRowListDataResp = append(textRowListDataResp, textRowDataResp)
-		}
-
-	}
-
-	return
-}
-
-// getCalculateValue 获取公式计算的结果
-func getCalculateValue(tableDataMap map[int]map[string]request.ManualDataReq, tag, row string, calculateCellMap map[string]string) (val string, err error) {
-	rowInt, err := strconv.Atoi(row)
-	if err != nil {
-		return
-	}
-
-	// 单元格的标签名
-	cellTagName := strings.ToUpper(tag) + row
-	val, ok := calculateCellMap[cellTagName]
-	if ok {
-		return
-	}
-
-	// 查找行数据
-	rowData, ok := tableDataMap[rowInt]
-	if !ok {
-		err = errors.New("查找" + row + "行的数据失败")
-		return
-	}
-
-	// 查找单元格数据
-	colData, ok := rowData[tag]
-	if !ok {
-		err = errors.New("查找单元格" + tag + row + "的数据失败")
-		return
-	}
-
-	// 如果不是计算单元格
-	if colData.DataType != 4 {
-		val = colData.ShowValue
-		return
-	}
-
-	// 如果是计算单元格
-	calculateCellMap[cellTagName] = ``
-
-	tagMap := make(map[string]float64)
-	for _, relation := range colData.RelationEdbInfoList {
-		relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
-		valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
-	}
-
-	// 计算
-	val, _, err = calculate(strings.ToUpper(colData.Value), tagMap)
-	if err != nil {
-		return
-	}
-	// 重新赋值
-	colData.ShowValue = val
-	tableDataMap[rowInt][tag] = colData
-	calculateCellMap[cellTagName] = val
-
-	return
-}
-
-// calculate 公式计算
-func calculate(calculateFormula string, TagMap map[string]float64) (calVal, errMsg string, err error) {
-	if calculateFormula == "" {
-		errMsg = "公式异常"
-		err = errors.New(errMsg)
-		return
-	}
-	calculateFormula = strings.TrimPrefix(calculateFormula, "=")
-	calculateFormula = strings.Replace(calculateFormula, "(", "(", -1)
-	calculateFormula = strings.Replace(calculateFormula, ")", ")", -1)
-	calculateFormula = strings.Replace(calculateFormula, ",", ",", -1)
-	calculateFormula = strings.Replace(calculateFormula, "。", ".", -1)
-	calculateFormula = strings.Replace(calculateFormula, "%", "*0.01", -1)
-
-	formulaFormStr := utils.ReplaceFormula(TagMap, calculateFormula)
-	//计算公式异常,那么就移除该指标
-	if formulaFormStr == `` {
-		errMsg = "公式异常"
-		err = errors.New(errMsg)
-		return
-	}
-
-	expression := formula.NewExpression(formulaFormStr)
-	calResult, err := expression.Evaluate()
-	if err != nil {
-		errMsg = "计算失败"
-		err = errors.New("计算失败:Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
-		// 分母为0的报错
-		if strings.Contains(err.Error(), "divide by zero") {
-			errMsg = "分母不能为0"
-			err = errors.New("分母不能为空,计算公式:" + formulaFormStr)
-		}
-		return
-	}
-	// 如果计算结果是NAN,那么就提示报错
-	if calResult.IsNan() {
-		errMsg = "计算失败"
-		err = errors.New("计算失败:计算结果是:NAN;formulaStr:" + formulaFormStr)
-		return
-	}
-	calVal = calResult.String()
-
-	// 转Decimal然后四舍五入
-	valDecimal, err := decimal.NewFromString(calVal)
-	if err != nil {
-		errMsg = "计算失败"
-		err = errors.New("计算失败,结果转 Decimal 失败:Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
-		return
-	}
-	calVal = valDecimal.Round(4).String()
-
-	return
-}
-
 // GetEdbIdsFromExcelCodes 获取表格中的指标IDs
 func GetEdbIdsFromExcelCodes(excelCodes []string, sysUserId int, lang string) (edbIds []int, err error) {
 	edbIds = make([]int, 0)

+ 932 - 0
services/data/excel/time_table.go

@@ -0,0 +1,932 @@
+package excel
+
+import (
+	"errors"
+	"eta/eta_api/models/data_manage"
+	"eta/eta_api/models/data_manage/excel/request"
+	"eta/eta_api/services/data"
+	"eta/eta_api/utils"
+	"fmt"
+	"github.com/shopspring/decimal"
+	"github.com/yidane/formula"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// TableDataConfig
+// @Description: 表格配置
+type TableDataConfig struct {
+	EdbInfoIdList    []int                     `description:"指标id列表,从左至右,从上到下的顺序"`
+	Sort             int                       `description:"日期排序,0:倒序,1:正序"`
+	Data             []ManualData              `description:"数据列表"`
+	Num              int                       `description:"实际数据需要列出来的期数"`
+	RemoveDate       []string                  `description:"不展示的日期"`
+	ManualDate       []string                  `description:"手动配置的日期(未来的日期)"`
+	TableEdbInfoList []TableEdbInfo            `description:"表格内指标信息"`
+	TextRowData      [][]request.ManualDataReq `description:"文本列表"`
+}
+
+// TableEdbInfo
+// @Description: 表格指标信息
+type TableEdbInfo struct {
+	EdbInfoId    int    `description:"指标ID"`
+	Tag          string `description:"标签"`
+	EdbName      string `description:"指标名称"`
+	EdbNameEn    string `description:"英文指标名称"`
+	EdbAliasName string `description:"指标别名"`
+	Frequency    string `description:"频度"`
+	Unit         string `description:"单位"`
+	UnitEn       string `description:"英文单位"`
+}
+
+// ManualData
+// @Description: 手工文本配置
+type ManualData struct {
+	DataType            int                       `description:"数据类型,1:普通的,2:插值法,3:手动输入,4:公式计算"`
+	DataTime            string                    `description:"所属日期"`
+	DataTimeType        int                       `description:"日期类型,1:实际日期;2:未来日期"`
+	ShowValue           string                    `description:"展示值"`
+	Value               string                    `description:"实际值(计算公式)"`
+	EdbInfoId           int                       `description:"指标id"`
+	Tag                 string                    `description:"下标"`
+	RelationEdbInfoList []request.RelationEdbInfo `description:"关联指标(计算公式中关联的指标,用于计算的时候去匹配)"`
+}
+
+// GetDataByTableDataConfig 根据数据配置获取表格数据
+func GetDataByTableDataConfig(tableDataConfig TableDataConfig) (resultResp request.TableDataReq, err error) {
+	// 没有选择指标的情况下,直接返回吧
+	if len(tableDataConfig.EdbInfoIdList) <= 0 {
+		return
+	}
+
+	// 实际期数没有的情况下,直接返回吧
+	if tableDataConfig.Num <= 0 {
+		return
+	}
+
+	// 获取所有的指标信息
+	edbInfoMap := make(map[int]*data_manage.EdbInfo)
+	edbInfoIdList := make([]int, 0)
+	// 标签与指标id的map
+	tagEdbInfoIdMap := make(map[string]int)
+	{
+		for _, tableEdbInfo := range tableDataConfig.TableEdbInfoList {
+			edbInfoIdList = append(edbInfoIdList, tableEdbInfo.EdbInfoId)
+			tagEdbInfoIdMap[tableEdbInfo.Tag] = tableEdbInfo.EdbInfoId
+		}
+		edbInfoList, tmpErr := data_manage.GetEdbInfoByIdList(edbInfoIdList)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		for _, v := range edbInfoList {
+			edbInfoMap[v.EdbInfoId] = v
+		}
+	}
+
+	manualDateMap := make(map[string]string, 0)
+	manualDateList := make([]string, 0)
+	for _, v := range tableDataConfig.Data {
+		if _, ok := manualDateMap[v.DataTime]; !ok {
+			manualDateMap[v.DataTime] = v.DataTime
+			manualDateList = append(manualDateList, v.DataTime)
+		}
+	}
+
+	// 寻找A列的数据列表
+	firstEdbInfo, ok := edbInfoMap[tableDataConfig.TableEdbInfoList[0].EdbInfoId]
+	if !ok {
+		err = errors.New("找不到A列指标")
+		return
+	}
+	baseFirstEdbInfoDataList, err := GetFirstEdbDataList(firstEdbInfo, tableDataConfig.Num, manualDateList)
+	if err != nil {
+		return
+	}
+	// A列找不到数据,那么就直接返回吧
+	if len(baseFirstEdbInfoDataList) <= 0 {
+		return
+	}
+
+	firstEdbInfoDataList := make([]request.ManualDataReq, 0)
+	if tableDataConfig.RemoveDate != nil && len(tableDataConfig.RemoveDate) > 0 {
+		for _, v := range baseFirstEdbInfoDataList {
+			if utils.InArrayByStr(tableDataConfig.RemoveDate, v.DataTime) {
+				continue
+			}
+			firstEdbInfoDataList = append(firstEdbInfoDataList, v)
+		}
+	} else {
+		firstEdbInfoDataList = baseFirstEdbInfoDataList
+	}
+	if len(firstEdbInfoDataList) <= 0 {
+		return
+	}
+	// 实际数据的最后一天
+	lastRealDateTime, err := time.ParseInLocation(utils.FormatDate, firstEdbInfoDataList[0].DataTime, time.Local)
+	if err != nil {
+		return
+	}
+
+	dateMap := make(map[string]string)
+	dateList := make([]string, 0)
+	edbInfoIdDateDataMap := make(map[int]map[string]request.ManualDataReq)
+	firstDateDataMap := make(map[string]request.ManualDataReq)
+	for _, v := range firstEdbInfoDataList {
+		dateList = append(dateList, v.DataTime)
+		dateMap[v.DataTime] = v.DataTime
+		firstDateDataMap[v.DataTime] = v
+	}
+
+	// 将手工数据的日期填补进去(未来的日期,过去的就不管了)
+	for _, manualData := range tableDataConfig.Data {
+		if !utils.InArrayByStr(dateList, manualData.DataTime) {
+			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, manualData.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			if tmpDateTime.After(lastRealDateTime) {
+				dateList = append(dateList, manualData.DataTime)
+			}
+		}
+	}
+
+	edbInfoIdDateDataMap[firstEdbInfo.EdbInfoId] = firstDateDataMap
+
+	for k, edbInfoId := range tableDataConfig.EdbInfoIdList {
+		if k == 0 {
+			continue
+		}
+
+		tmpEdbInfo, ok := edbInfoMap[edbInfoId]
+		if !ok {
+			err = errors.New("找不到A列指标")
+			return
+		}
+		otherDataList, tmpErr := GetOtherEdbDataList(tmpEdbInfo, dateList)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+
+		tmpDateDataMap := make(map[string]request.ManualDataReq)
+		for _, v := range otherDataList {
+			tmpDateDataMap[v.DataTime] = v
+		}
+		edbInfoIdDateDataMap[tmpEdbInfo.EdbInfoId] = tmpDateDataMap
+	}
+
+	for _, v := range tableDataConfig.Data {
+		tmpDate := v.DataTime
+		if _, ok := dateMap[tmpDate]; !ok {
+			dateMap[v.DataTime] = tmpDate
+		}
+
+		edbInfoIdDateData, ok := edbInfoIdDateDataMap[v.EdbInfoId]
+		if !ok {
+			edbInfoIdDateData = make(map[string]request.ManualDataReq)
+		}
+
+		// 判断是否存在该日期的数据(不存在,那么插入数据吧,存在就不管了)
+		tmpManualData, ok := edbInfoIdDateData[tmpDate]
+		if !ok {
+			edbInfoIdDateData[tmpDate] = request.ManualDataReq{
+				DataType:  v.DataType,
+				DataTime:  v.DataTime,
+				ShowValue: v.ShowValue,
+				Value:     v.Value,
+			}
+		} else {
+			if (tmpManualData.DataType == 3 || tmpManualData.DataType == 4) && tmpManualData.ShowValue == `` {
+				tmpManualData.DataType = v.DataType
+				tmpManualData.ShowValue = v.ShowValue
+				tmpManualData.Value = v.Value
+				tmpManualData.RelationEdbInfoList = v.RelationEdbInfoList
+
+				edbInfoIdDateData[tmpDate] = tmpManualData
+			}
+		}
+		edbInfoIdDateDataMap[v.EdbInfoId] = edbInfoIdDateData
+	}
+
+	// 获取数据的日期排序
+	sortDateTimeList := make([]time.Time, 0)
+	{
+		sortDateList := dateList
+		if tableDataConfig.Sort == 1 {
+			baseDateList := utils.StrArr{}
+			baseDateList = append(baseDateList, sortDateList...)
+			sort.Sort(baseDateList)
+			sortDateList = append([]string{}, baseDateList...)
+		} else {
+			sort.Strings(sortDateList)
+		}
+		for _, v := range sortDateList {
+			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			sortDateTimeList = append(sortDateTimeList, tmpDateTime)
+		}
+	}
+
+	// 数据处理,处理成表格的数据格式
+	tableDataMap, textRowListDataResp := handleTable(tagEdbInfoIdMap, lastRealDateTime, sortDateTimeList, edbInfoIdDateDataMap, tableDataConfig.Data, tableDataConfig.TextRowData)
+
+	data := make([]request.EdbInfoData, 0)
+	for _, tableEdbInfo := range tableDataConfig.TableEdbInfoList {
+		tagEdbInfoIdMap[tableEdbInfo.Tag] = tableEdbInfo.EdbInfoId
+
+		manualDataReqList := make([]request.ManualDataReq, 0)
+		tmpEdbInfoData := request.EdbInfoData{
+			EdbInfoId:    tableEdbInfo.EdbInfoId,
+			Tag:          tableEdbInfo.Tag,
+			EdbName:      tableEdbInfo.EdbName,
+			EdbNameEn:    tableEdbInfo.EdbNameEn,
+			EdbAliasName: tableEdbInfo.EdbAliasName,
+			Frequency:    tableEdbInfo.Frequency,
+			Unit:         tableEdbInfo.Unit,
+			UnitEn:       tableEdbInfo.UnitEn,
+			Data:         manualDataReqList,
+		}
+
+		edbInfo, ok := edbInfoMap[tableEdbInfo.EdbInfoId]
+		if ok {
+			tmpEdbInfoData.EdbName = edbInfo.EdbName
+			tmpEdbInfoData.EdbNameEn = edbInfo.EdbNameEn
+			tmpEdbInfoData.Frequency = edbInfo.Frequency
+			tmpEdbInfoData.Unit = edbInfo.Unit
+			tmpEdbInfoData.UnitEn = edbInfo.UnitEn
+			tmpEdbInfoData.ClassifyId = edbInfo.ClassifyId
+			tmpEdbInfoData.IsJoinPermission = edbInfo.IsJoinPermission
+		}
+
+		for index, dateTime := range sortDateTimeList {
+			dataTimeType := 1
+			if dateTime.After(lastRealDateTime) {
+				dataTimeType = 2
+			}
+			tmpDateTimeStr := dateTime.Format(utils.FormatDate)
+
+			rowData, ok := tableDataMap[index+1]
+			if !ok {
+				manualDataReqList = append(manualDataReqList, request.ManualDataReq{
+					DataType:            3,
+					DataTime:            tmpDateTimeStr,
+					DataTimeType:        dataTimeType,
+					ShowValue:           "",
+					Value:               "",
+					RelationEdbInfoList: nil,
+				})
+				continue
+			}
+
+			tmpData, ok := rowData[tableEdbInfo.Tag]
+			if !ok {
+				manualDataReqList = append(manualDataReqList, request.ManualDataReq{
+					DataType:            3,
+					DataTime:            tmpDateTimeStr,
+					DataTimeType:        dataTimeType,
+					ShowValue:           "",
+					Value:               "",
+					RelationEdbInfoList: nil,
+				})
+				continue
+			}
+
+			tmpData.DataTimeType = dataTimeType
+			manualDataReqList = append(manualDataReqList, tmpData)
+		}
+
+		tmpEdbInfoData.Data = manualDataReqList
+
+		data = append(data, tmpEdbInfoData)
+	}
+
+	// 处理一下数据格式
+	for _, d := range data {
+		for k2, d2 := range d.Data {
+			// 可能有ShowValue非数值, 转换一下报错则continue
+			vf, e := strconv.ParseFloat(d2.ShowValue, 64)
+			if e != nil {
+				continue
+			}
+			d.Data[k2].ShowValue = utils.FormatTableDataShowValue(vf)
+		}
+	}
+	for _, d := range textRowListDataResp {
+		for k2, d2 := range d {
+			// 可能有ShowValue非数值, 转换一下报错则continue
+			vf, e := strconv.ParseFloat(d2.ShowValue, 64)
+			if e != nil {
+				continue
+			}
+			d[k2].ShowValue = utils.FormatTableDataShowValue(vf)
+		}
+	}
+
+	resultResp = request.TableDataReq{
+		EdbInfoIdList: edbInfoIdList,
+		Sort:          tableDataConfig.Sort,
+		TextRowData:   textRowListDataResp,
+		Data:          data,
+	}
+
+	return
+}
+
+// GetTableDataConfig 根据TableDataReq配置获取相关数据配置
+func GetTableDataConfig(reqData request.TableDataReq) (tableDataConfig TableDataConfig, err error) {
+	// 指标数据
+	tableDataConfig.EdbInfoIdList = reqData.EdbInfoIdList
+	tableDataConfig.Sort = reqData.Sort
+
+	if len(reqData.Data) <= 0 {
+		err = errors.New("数据不能为空")
+		return
+	}
+
+	// 开始日期
+	var startDate string
+	// A列的指标id
+	var firstEdbInfoId int
+	// 手工操作的数据列
+	manualDataList := make([]ManualData, 0)
+	// 指标配置列表
+	tableEdbInfoList := make([]TableEdbInfo, 0)
+
+	// 第一列的日期map
+	firstDateMap := make(map[string]string)
+	manualDateMap := make(map[string]string)
+
+	for _, v := range reqData.Data {
+		// 指标信息
+		tmpTableEdbInfo := TableEdbInfo{
+			EdbInfoId:    v.EdbInfoId,
+			Tag:          v.Tag,
+			EdbName:      v.EdbName,
+			EdbNameEn:    v.EdbNameEn,
+			EdbAliasName: v.EdbAliasName,
+			Frequency:    v.Frequency,
+			Unit:         v.Unit,
+			UnitEn:       v.UnitEn,
+		}
+		tableEdbInfoList = append(tableEdbInfoList, tmpTableEdbInfo)
+
+		// 确定数据A列
+		if v.Tag == "A" {
+			firstEdbInfoId = v.EdbInfoId
+			lenData := len(v.Data)
+			if lenData <= 0 {
+				err = errors.New("A列不能为空")
+				return
+			}
+			index := 0
+			if reqData.Sort == 1 {
+				// 倒序
+				index = lenData - 1
+			}
+
+			startDate = v.Data[index].DataTime
+
+			// 存在的日期列表
+			for _, data := range v.Data {
+				firstDateMap[data.DataTime] = data.DataTime
+
+				if data.DataTimeType == 2 {
+					manualDateMap[data.DataTime] = data.DataTime
+				}
+			}
+		}
+
+		for _, data := range v.Data {
+			if data.DataType == 3 || data.DataType == 4 {
+				tmpManualData := ManualData{
+					DataType:            data.DataType,
+					DataTime:            data.DataTime,
+					DataTimeType:        data.DataTimeType,
+					ShowValue:           data.ShowValue,
+					Value:               data.Value,
+					EdbInfoId:           v.EdbInfoId,
+					Tag:                 v.Tag,
+					RelationEdbInfoList: data.RelationEdbInfoList,
+				}
+				if data.DataType == 4 {
+					tmpManualData.ShowValue = ``
+				}
+				manualDataList = append(manualDataList, tmpManualData)
+			}
+		}
+	}
+
+	// 总共需要的期数
+	num := len(reqData.Data[0].Data)
+
+	removeDate := make([]string, 0)
+
+	// 获取期数
+	{
+		firstDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+
+		edbInfo, tmpErr := data_manage.GetEdbInfoById(firstEdbInfoId)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+
+		var firstDataList []*data_manage.EdbDataList
+		switch edbInfo.EdbInfoType {
+		case 0:
+			firstDataList, err = data_manage.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, ``, ``)
+		case 1:
+			_, firstDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, ``, ``, false)
+		default:
+			err = errors.New(fmt.Sprint("获取失败,指标类型异常", edbInfo.EdbInfoType))
+		}
+		if err != nil {
+			return
+		}
+
+		// 获取日期内的数据(包含开始日期前一个日期,以及 结束日期后一个日期,目的为了做空日期时的 插值法兼容)
+		baseDataList := make([]*data_manage.EdbDataList, 0)
+		for _, data := range firstDataList {
+			tmpDate := data.DataTime
+			tmpDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, tmpDate, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			if tmpDateTime.Before(firstDateTime) {
+				continue
+			}
+			baseDataList = append(baseDataList, data)
+		}
+
+		// 筛选出需要删除的日期
+		for _, tmpData := range baseDataList {
+			//firstDateMap{}
+			if _, ok := firstDateMap[tmpData.DataTime]; !ok {
+				removeDate = append(removeDate, tmpData.DataTime)
+			}
+		}
+	}
+
+	tableDataConfig.Num = num
+	tableDataConfig.RemoveDate = removeDate
+	tableDataConfig.Data = manualDataList
+	tableDataConfig.TableEdbInfoList = tableEdbInfoList
+	tableDataConfig.TextRowData = reqData.TextRowData
+
+	return
+}
+
+// handleTable 表格数据处理
+func handleTable(tagEdbInfoIdMap map[string]int, lastRealDateTime time.Time, sortDateTimeList []time.Time, edbInfoIdDateDataMap map[int]map[string]request.ManualDataReq, manualDataList []ManualData, textRowData [][]request.ManualDataReq) (tableDataMap map[int]map[string]request.ManualDataReq, textRowListDataResp [][]request.ManualDataReq) {
+	tagList := make([]string, 0)
+	for tag, _ := range tagEdbInfoIdMap {
+		tagList = append(tagList, tag)
+	}
+	sort.Strings(tagList)
+
+	tableDataMap = make(map[int]map[string]request.ManualDataReq) //行、列数据
+
+	// 日期与行的关系
+	dateIndexMap := make(map[string]int)
+
+	for k, dateTime := range sortDateTimeList {
+		rowDataMap := make(map[string]request.ManualDataReq)
+
+		dataTimeType := 1
+		if dateTime.After(lastRealDateTime) {
+			dataTimeType = 2
+		}
+
+		tmpDateTimeStr := dateTime.Format(utils.FormatDate)
+		dateIndexMap[tmpDateTimeStr] = k + 1
+
+		for _, tag := range tagList {
+			edbInfoId, ok := tagEdbInfoIdMap[tag]
+			if !ok { // 没有找到该指标的映射关系,那么就用空串填补
+				rowDataMap[tag] = request.ManualDataReq{
+					DataType:            3,
+					DataTime:            tmpDateTimeStr,
+					DataTimeType:        dataTimeType,
+					ShowValue:           "",
+					Value:               "",
+					RelationEdbInfoList: nil,
+				}
+				continue
+			}
+
+			// 获取指标的数据map
+			dateDataMap, ok := edbInfoIdDateDataMap[edbInfoId]
+			if !ok { // 没有找到该指标的数据,那么就用空串填补
+				rowDataMap[tag] = request.ManualDataReq{
+					DataType:            3,
+					DataTime:            tmpDateTimeStr,
+					DataTimeType:        dataTimeType,
+					ShowValue:           "",
+					Value:               "",
+					RelationEdbInfoList: nil,
+				}
+				continue
+			}
+
+			// 获取指标该日期的数据
+			tmpData, ok := dateDataMap[tmpDateTimeStr]
+			if !ok { // 该指标没有找到对应日期的数据,那么就用空串填补
+				rowDataMap[tag] = request.ManualDataReq{
+					DataType:            3,
+					DataTime:            tmpDateTimeStr,
+					DataTimeType:        dataTimeType,
+					ShowValue:           "",
+					Value:               "",
+					RelationEdbInfoList: nil,
+				}
+				continue
+			}
+			tmpData.DataTimeType = dataTimeType
+			rowDataMap[tag] = tmpData
+		}
+		tableDataMap[k+1] = rowDataMap
+	}
+
+	// 替换手工设置的数据
+	for _, manualData := range manualDataList {
+		// 找不到该日期,说明这日期过期了,不处理
+		index, ok := dateIndexMap[manualData.DataTime]
+		if !ok {
+			continue
+		}
+
+		// 获取对应行的数据
+		rowDataMap, ok := tableDataMap[index]
+		if !ok {
+			continue
+		}
+
+		// 找到对应的单元格
+		tmpData, ok := rowDataMap[manualData.Tag]
+		if !ok {
+			continue
+		}
+
+		// 如果该单元格实际有数据(包含预测值),或者插值法补充了数据的话,那么就不用手动填入的数据
+		if utils.InArrayByInt([]int{1, 2, 5}, tmpData.DataType) {
+			continue
+		}
+
+		// 手工填写的数字
+		if tmpData.DataType == 3 {
+			tmpData.ShowValue = manualData.ShowValue
+			tmpData.Value = manualData.Value
+			tableDataMap[index][manualData.Tag] = tmpData
+
+			//edbInfoIdDateDataMap[manualData.EdbInfoId][manualData.DataTime] = tmpData
+			continue
+		}
+
+		// 公式
+		tmpData.DataType = manualData.DataType
+		tmpData.ShowValue = ``
+		tmpData.Value = manualData.Value
+		tmpData.RelationEdbInfoList = manualData.RelationEdbInfoList
+		tableDataMap[index][manualData.Tag] = tmpData
+
+	}
+
+	// 文本行的列表插入
+	lenTableData := len(tableDataMap)
+
+	// 文本行第一列的数据列表(可能多行)
+	firstColTextRowList := make([]request.ManualDataReq, 0)
+	// 参与计算的文本行列表数据
+	tmpTextRowList := make([][]request.ManualDataReq, 0)
+	for k, textRowList := range textRowData {
+		// 判断列数是否匹配,不匹配的话那么过滤
+		if len(tagList)+1 != len(textRowList) {
+			continue
+		}
+		rowDataMap := make(map[string]request.ManualDataReq)
+		tmpTextRow := make([]request.ManualDataReq, 0)
+		for index, textRow := range textRowList {
+			// 移除第一列,因为第一列是日期列
+			if index == 0 {
+				firstColTextRowList = append(firstColTextRowList, textRow)
+				continue
+			}
+			rowDataMap[tagList[index-1]] = textRow
+			tmpTextRow = append(tmpTextRow, textRow)
+		}
+
+		tableDataMap[lenTableData+k+1] = rowDataMap
+		tmpTextRowList = append(tmpTextRowList, tmpTextRow)
+	}
+
+	// 参与计算的单元格
+	calculateCellMap := make(map[string]string)
+
+	// 计算手工填写的单元格
+	for _, manualData := range manualDataList {
+		// 找不到该日期,说明这日期过期了,不处理
+		index, ok := dateIndexMap[manualData.DataTime]
+		if !ok {
+			continue
+		}
+
+		// 获取对应行的数据
+		rowDataMap, ok := tableDataMap[index]
+		if !ok {
+			continue
+		}
+
+		// 找到对应的单元格
+		colData, ok := rowDataMap[manualData.Tag]
+		if !ok {
+			continue
+		}
+
+		// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
+		if colData.DataType != 4 {
+			continue
+		}
+
+		tagMap := make(map[string]float64)
+		lenRelation := len(colData.RelationEdbInfoList)
+		replaceNum := 0
+		for _, relation := range colData.RelationEdbInfoList {
+			relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
+			valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
+			if tmpErr != nil {
+				continue
+			}
+			tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
+			if tmpErr != nil {
+				continue
+			}
+			tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
+			replaceNum++
+		}
+
+		// 如果替换的数据与关联的不一致,那么就退出当前循环
+		if lenRelation != replaceNum {
+			continue
+		}
+
+		// 计算
+		val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
+		// 计算失败,退出循环
+		if err != nil {
+			continue
+		}
+		// 重新赋值
+		colData.ShowValue = val
+		tableDataMap[index][manualData.Tag] = colData
+
+	}
+
+	// 计算文本行的单元格
+	for k, textRow := range tmpTextRowList {
+		// 获取对应行的数据
+		index := lenTableData + k + 1
+		rowDataMap, ok := tableDataMap[index]
+		if !ok {
+			continue
+		}
+
+		for colIndex, _ := range textRow {
+			currTag := tagList[colIndex]
+			// 找到对应的单元格
+			colData, ok := rowDataMap[currTag]
+			if !ok {
+				continue
+			}
+
+			// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
+			if colData.DataType != 4 {
+				continue
+			}
+
+			tagMap := make(map[string]float64)
+			lenRelation := len(colData.RelationEdbInfoList)
+			replaceNum := 0
+			for _, relation := range colData.RelationEdbInfoList {
+				relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
+				valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
+				if tmpErr != nil {
+					continue
+				}
+				tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
+				if tmpErr != nil {
+					continue
+				}
+				tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
+				replaceNum++
+			}
+
+			// 如果替换的数据与关联的不一致,那么就退出当前循环
+			if lenRelation != replaceNum {
+				continue
+			}
+
+			// 计算
+			val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
+			// 计算失败,退出循环
+			if err != nil {
+				continue
+			}
+			// 重新赋值
+			colData.ShowValue = val
+			tableDataMap[index][currTag] = colData
+		}
+
+	}
+
+	// 计算文本行第一列的数据值(多行)
+	for k, colData := range firstColTextRowList {
+		// 如果该单元格不是计算公式的单元格,那么直接退出当前循环即可
+		if colData.DataType != 4 {
+			continue
+		}
+
+		tagMap := make(map[string]float64)
+		lenRelation := len(colData.RelationEdbInfoList)
+		replaceNum := 0
+		for _, relation := range colData.RelationEdbInfoList {
+			relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
+			valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
+			if tmpErr != nil {
+				continue
+			}
+			tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
+			if tmpErr != nil {
+				continue
+			}
+			tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
+			replaceNum++
+		}
+
+		// 如果替换的数据与关联的不一致,那么就退出当前循环
+		if lenRelation != replaceNum {
+			continue
+		}
+
+		// 计算
+		val, _, err := calculate(strings.ToUpper(colData.Value), tagMap)
+		// 计算失败,退出循环
+		if err != nil {
+			continue
+		}
+		// 重新赋值
+		colData.ShowValue = val
+		firstColTextRowList[k] = colData
+	}
+
+	{
+		// 文本行的数据处理返回
+		textRowListDataResp = make([][]request.ManualDataReq, 0)
+		newLenTableDataMap := len(tableDataMap)
+		// 文本行的第一行所在的位置
+		firstTextRow := lenTableData + 1
+		for i := firstTextRow; i <= newLenTableDataMap; i++ {
+			textRowDataResp := make([]request.ManualDataReq, 0)
+
+			textRowDataResp = append(textRowDataResp, firstColTextRowList[i-firstTextRow])
+			for _, tmpTag := range tagList {
+				textRowDataResp = append(textRowDataResp, tableDataMap[i][tmpTag])
+			}
+			textRowListDataResp = append(textRowListDataResp, textRowDataResp)
+		}
+
+	}
+
+	return
+}
+
+// getCalculateValue 获取公式计算的结果
+func getCalculateValue(tableDataMap map[int]map[string]request.ManualDataReq, tag, row string, calculateCellMap map[string]string) (val string, err error) {
+	rowInt, err := strconv.Atoi(row)
+	if err != nil {
+		return
+	}
+
+	// 单元格的标签名
+	cellTagName := strings.ToUpper(tag) + row
+	val, ok := calculateCellMap[cellTagName]
+	if ok {
+		return
+	}
+
+	// 查找行数据
+	rowData, ok := tableDataMap[rowInt]
+	if !ok {
+		err = errors.New("查找" + row + "行的数据失败")
+		return
+	}
+
+	// 查找单元格数据
+	colData, ok := rowData[tag]
+	if !ok {
+		err = errors.New("查找单元格" + tag + row + "的数据失败")
+		return
+	}
+
+	// 如果不是计算单元格
+	if colData.DataType != 4 {
+		val = colData.ShowValue
+		return
+	}
+
+	// 如果是计算单元格
+	calculateCellMap[cellTagName] = ``
+
+	tagMap := make(map[string]float64)
+	for _, relation := range colData.RelationEdbInfoList {
+		relationCellTagName := strings.ToUpper(relation.Tag) + relation.Row
+		valStr, tmpErr := getCalculateValue(tableDataMap, relation.Tag, relation.Row, calculateCellMap)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		tmpValDecimal, tmpErr := decimal.NewFromString(valStr)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		tagMap[relationCellTagName], _ = tmpValDecimal.Float64()
+	}
+
+	// 计算
+	val, _, err = calculate(strings.ToUpper(colData.Value), tagMap)
+	if err != nil {
+		return
+	}
+	// 重新赋值
+	colData.ShowValue = val
+	tableDataMap[rowInt][tag] = colData
+	calculateCellMap[cellTagName] = val
+
+	return
+}
+
+// calculate 公式计算
+func calculate(calculateFormula string, TagMap map[string]float64) (calVal, errMsg string, err error) {
+	if calculateFormula == "" {
+		errMsg = "公式异常"
+		err = errors.New(errMsg)
+		return
+	}
+	calculateFormula = strings.TrimPrefix(calculateFormula, "=")
+	calculateFormula = strings.Replace(calculateFormula, "(", "(", -1)
+	calculateFormula = strings.Replace(calculateFormula, ")", ")", -1)
+	calculateFormula = strings.Replace(calculateFormula, ",", ",", -1)
+	calculateFormula = strings.Replace(calculateFormula, "。", ".", -1)
+	calculateFormula = strings.Replace(calculateFormula, "%", "*0.01", -1)
+
+	formulaFormStr := utils.ReplaceFormula(TagMap, calculateFormula)
+	//计算公式异常,那么就移除该指标
+	if formulaFormStr == `` {
+		errMsg = "公式异常"
+		err = errors.New(errMsg)
+		return
+	}
+
+	expression := formula.NewExpression(formulaFormStr)
+	calResult, err := expression.Evaluate()
+	if err != nil {
+		errMsg = "计算失败"
+		err = errors.New("计算失败:Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
+		// 分母为0的报错
+		if strings.Contains(err.Error(), "divide by zero") {
+			errMsg = "分母不能为0"
+			err = errors.New("分母不能为空,计算公式:" + formulaFormStr)
+		}
+		return
+	}
+	// 如果计算结果是NAN,那么就提示报错
+	if calResult.IsNan() {
+		errMsg = "计算失败"
+		err = errors.New("计算失败:计算结果是:NAN;formulaStr:" + formulaFormStr)
+		return
+	}
+	calVal = calResult.String()
+
+	// 转Decimal然后四舍五入
+	valDecimal, err := decimal.NewFromString(calVal)
+	if err != nil {
+		errMsg = "计算失败"
+		err = errors.New("计算失败,结果转 Decimal 失败:Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
+		return
+	}
+	calVal = valDecimal.Round(4).String()
+
+	return
+}

+ 39 - 7
services/excel/lucky_sheet.go

@@ -1460,7 +1460,7 @@ func getColor(bgStr string) string {
 }
 
 // GetTableDataByCustomData 通过自定义表格数据获取表格数据
-func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTableData TableData, err error) {
+func GetTableDataByCustomData(excelType int, data request.TableDataReq, lang string) (selfTableData TableData, err error) {
 	tableDataList := make([][]LuckySheetDataValue, 0)
 	mergeList := make([]TableDataMerge, 0)
 
@@ -1486,9 +1486,14 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 		// 第一行
 		{
 			firstCol := make([]LuckySheetDataValue, 0)
+			dateStr := "日期"
+			switch lang {
+			case utils.EnLangVersion:
+				dateStr = "Date"
+			}
 			firstCol = append(firstCol, LuckySheetDataValue{
-				Value:   "日期",
-				Monitor: "日期",
+				Value:   dateStr,
+				Monitor: dateStr,
 				MergeCell: LuckySheetDataConfigMerge{
 					Row:    0, //行数
 					Column: 0, //列数
@@ -1501,6 +1506,11 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 				edbName := v.EdbName
 				if v.EdbAliasName != `` {
 					edbName = v.EdbAliasName
+				} else {
+					switch lang {
+					case utils.EnLangVersion:
+						edbName = v.EdbNameEn
+					}
 				}
 				firstCol = append(firstCol, LuckySheetDataValue{
 					Value:     edbName,
@@ -1518,7 +1528,13 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 			secondCol = append(secondCol, LuckySheetDataValue{})
 
 			for _, v := range data.Data {
-				name := v.Unit + " / " + v.Frequency
+				var name string
+				switch lang {
+				case utils.EnLangVersion:
+					name = v.UnitEn + " / " + utils.GetFrequencyEn(v.Frequency)
+				default:
+					name = v.Unit + " / " + v.Frequency
+				}
 				secondCol = append(secondCol, LuckySheetDataValue{
 					Value:     name,
 					Monitor:   name,
@@ -1586,9 +1602,14 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 		// 第一行
 		{
 			firstCol := make([]LuckySheetDataValue, 0)
+			dateStr := "日期"
+			switch lang {
+			case utils.EnLangVersion:
+				dateStr = "Date"
+			}
 			firstCol = append(firstCol, LuckySheetDataValue{
-				Value:   "日期",
-				Monitor: "日期",
+				Value:   dateStr,
+				Monitor: dateStr,
 				MergeCell: LuckySheetDataConfigMerge{
 					Row:    0, //行数
 					Column: 0, //列数
@@ -1632,6 +1653,11 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 				edbName := tmpEdbInfo.EdbName
 				if tmpEdbInfo.EdbAliasName != `` {
 					edbName = tmpEdbInfo.EdbAliasName
+				} else {
+					switch lang {
+					case utils.EnLangVersion:
+						edbName = tmpEdbInfo.EdbNameEn
+					}
 				}
 				dataCol = append(dataCol, LuckySheetDataValue{
 					Value:     edbName,
@@ -1642,7 +1668,13 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 
 			// 指标单位、频度
 			{
-				name := tmpEdbInfo.Unit + " / " + tmpEdbInfo.Frequency
+				var name string
+				switch lang {
+				case utils.EnLangVersion:
+					name = tmpEdbInfo.UnitEn + " / " + utils.GetFrequencyEn(tmpEdbInfo.Frequency)
+				default:
+					name = tmpEdbInfo.Unit + " / " + tmpEdbInfo.Frequency
+				}
 				dataCol = append(dataCol, LuckySheetDataValue{
 					Value:     name,
 					Monitor:   name,