Browse Source

新增指标单位

xyxie 9 months ago
parent
commit
5a362a83b7

+ 2 - 0
models/data_manage/excel/excel_chart_edb.go

@@ -17,6 +17,8 @@ type ExcelChartEdb struct {
 	EdbCode         string    `description:"指标编码"`
 	EdbName         string    `description:"指标名称"`
 	EdbNameEn       string    `description:"指标英文名称"`
+	Unit            string    `description:"指标单位"`
+	UnitEn          string    `description:"指标单位"`
 	DateSequence    string    `description:"日期序列选区"`
 	DataSequence    string    `description:"数据序列选区"`
 	SysUserId       int       `description:"创建人"`

+ 1 - 0
models/data_manage/excel/request/balance_table.go

@@ -6,6 +6,7 @@ type AddBalanceTableChartEdbItem struct {
 	DateSequenceStr string  `description:"日期序列"`
 	DataSequenceStr string  `description:"数据序列"`
 	EdbName         string  `description:"指标名称"`
+	Unit            string  `description:"指标单位"`
 	MaxData         float64 `description:"上限"`
 	MinData         float64 `description:"下限"`
 	IsOrder         bool    `description:"true:正序,false:逆序"`

+ 4 - 2
services/data/chart_info_excel_balance.go

@@ -65,6 +65,7 @@ func AddBalanceExcelChart(excelInfo *excelModel.ExcelInfo, req request.AddBalanc
 	for k, chartEdb := range req.ChartEdbInfoList {
 		excelEdb := new(excelModel.ExcelChartEdb)
 		excelEdb.EdbName = chartEdb.EdbName
+		excelEdb.Unit = chartEdb.Unit
 		randStr := utils.GetRandDigit(4)
 		excelEdb.EdbCode = `T` + time.Now().Format("060102150405") + "_" + randStr
 		excelEdb.ExcelInfoId = excelInfo.ExcelInfoId
@@ -357,6 +358,7 @@ func EditBalanceExcelChart(excelInfo *excelModel.ExcelInfo, req request.AddBalan
 		}
 
 		excelEdb.EdbName = chartEdb.EdbName
+		excelEdb.Unit = chartEdb.Unit
 		excelEdb.DateSequence = chartEdb.DateSequenceStr
 		excelEdb.DataSequence = chartEdb.DataSequenceStr
 		excelEdb.MaxData = chartEdb.MaxData
@@ -1630,8 +1632,8 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 			EdbType:           0,
 			Frequency:         "",
 			FrequencyEn:       "",
-			Unit:              "",
-			UnitEn:            "",
+			Unit:              v.Unit,
+			UnitEn:            v.UnitEn,
 			StartDate:         startDateStr,
 			EndDate:           endDateStr,
 			ModifyTime:        v.ModifyTime.Format(utils.FormatDateTime),