..

models/chart_series.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"encoding/json"
 	"eta/eta_forum_hub/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -115,12 +114,6 @@ func EditChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 		mappingList, ok := seriesEdbMap[v.ChartSeriesId]
 		if ok {
 			for _, edbItem := range mappingList {
-				dateConfStrByte, e := json.Marshal(edbItem.DateConf)
-				if e != nil {
-					err = e
-					return
-				}
-				dateConfStr := string(dateConfStrByte)
 				edbTmp := &ChartSeriesEdbMapping{
 					ChartSeriesId: seriesId,    //todo 系列ID
 					ChartInfoId:   chartInfoId, //todo 表图ID
@@ -128,7 +121,7 @@ func EditChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 					//EdbAliasName:            "",
 					//EdbAliasNameEn:          "",
 					DateConfName: edbItem.DateConfName,
-					DateConf:     dateConfStr,
+					DateConf:     edbItem.DateConf,
 					DateConfType: edbItem.DateConfType,
 					CreateTime:   time.Now(),
 					ModifyTime:   time.Now(),
@@ -204,12 +197,6 @@ func AddChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []
 		mappingList, ok := seriesEdbMap[v.ChartSeriesId]
 		if ok {
 			for _, edbItem := range mappingList {
-				dateConfStrByte, e := json.Marshal(edbItem.DateConf)
-				if e != nil {
-					err = e
-					return
-				}
-				dateConfStr := string(dateConfStrByte)
 				edbTmp := &ChartSeriesEdbMapping{
 					ChartSeriesId: seriesId,    //todo 系列ID
 					ChartInfoId:   chartInfoId, //todo 表图ID
@@ -218,7 +205,7 @@ func AddChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []
 					//EdbAliasNameEn:          "",
 					DateConfName: edbItem.DateConfName,
 					DateConfType: edbItem.DateConfType,
-					DateConf:     dateConfStr,
+					DateConf:     edbItem.DateConf,
 					CreateTime:   time.Now(),
 					ModifyTime:   time.Now(),
 				}