|
@@ -1022,7 +1022,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
|
|
|
}
|
|
|
|
|
|
|
|
|
-func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra string) (err error) {
|
|
|
+func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra, lang string) (err error) {
|
|
|
o := global.DbMap[utils.DbNameIndex]
|
|
|
to := o.Begin()
|
|
|
if to.Error != nil {
|
|
@@ -1142,8 +1142,17 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
|
|
|
fmt.Println("QueryRow Err:", err.Error())
|
|
|
return err
|
|
|
}
|
|
|
+ var edbAliasName, edbAliasNameEn string
|
|
|
if tmpChartEdbMapping != nil && tmpChartEdbMapping.ChartEdbMappingId > 0 {
|
|
|
chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
|
|
|
+ edbAliasName = tmpChartEdbMapping.EdbAliasName
|
|
|
+ edbAliasNameEn = tmpChartEdbMapping.EdbAliasNameEn
|
|
|
+ switch lang {
|
|
|
+ case utils.EnLangVersion:
|
|
|
+ edbAliasNameEn = v.EdbAliasName
|
|
|
+ default:
|
|
|
+ edbAliasName = v.EdbAliasName
|
|
|
+ }
|
|
|
tmpChartEdbMapping.ModifyTime = time.Now()
|
|
|
tmpChartEdbMapping.MaxData = v.MaxData
|
|
|
tmpChartEdbMapping.MinData = v.MinData
|
|
@@ -1156,19 +1165,22 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
|
|
|
tmpChartEdbMapping.ChartColor = v.ChartColor
|
|
|
tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
|
|
|
tmpChartEdbMapping.ChartWidth = v.ChartWidth
|
|
|
- tmpChartEdbMapping.EdbAliasName = v.EdbAliasName
|
|
|
+ tmpChartEdbMapping.EdbAliasName = edbAliasName
|
|
|
+ tmpChartEdbMapping.EdbAliasNameEn = edbAliasNameEn
|
|
|
tmpChartEdbMapping.IsConvert = v.IsConvert
|
|
|
tmpChartEdbMapping.ConvertType = v.ConvertType
|
|
|
tmpChartEdbMapping.ConvertValue = v.ConvertValue
|
|
|
tmpChartEdbMapping.ConvertUnit = v.ConvertUnit
|
|
|
tmpChartEdbMapping.ConvertEnUnit = v.ConvertEnUnit
|
|
|
- err = to.Select("ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName",
|
|
|
+ err = to.Select("ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName", "EdbAliasNameEn",
|
|
|
"IsConvert", "ConvertType", "ConvertValue", "ConvertUnit", "ConvertEnUnit").Updates(tmpChartEdbMapping).Error
|
|
|
if err != nil {
|
|
|
fmt.Println("chart_edb_mapping Err:" + err.Error())
|
|
|
return err
|
|
|
}
|
|
|
} else {
|
|
|
+ edbAliasNameEn = v.EdbAliasName
|
|
|
+ edbAliasName = v.EdbAliasName
|
|
|
mapItem := new(ChartEdbMapping)
|
|
|
mapItem.ChartInfoId = req.ChartInfoId
|
|
|
mapItem.EdbInfoId = v.EdbInfoId
|
|
@@ -1188,7 +1200,8 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
|
|
|
mapItem.PredictChartColor = v.PredictChartColor
|
|
|
mapItem.ChartWidth = v.ChartWidth
|
|
|
mapItem.Source = utils.CHART_SOURCE_DEFAULT
|
|
|
- mapItem.EdbAliasName = v.EdbAliasName
|
|
|
+ mapItem.EdbAliasName = edbAliasName
|
|
|
+ mapItem.EdbAliasNameEn = edbAliasNameEn
|
|
|
mapItem.IsConvert = v.IsConvert
|
|
|
mapItem.ConvertType = v.ConvertType
|
|
|
mapItem.ConvertValue = v.ConvertValue
|