fix:达梦数据库时间格式问题

models/chart.go

@@ -210,7 +210,7 @@ type ChartEdbInfoMapping struct {
 	ChartStyle          string      `gorm:"column:chart_style" description:"图表类型"`
 	ChartColor          string      `gorm:"column:chart_color" description:"颜色"`
 	ChartWidth          float64     `gorm:"column:chart_width" description:"线条大小"`
-	DataList            interface{} `gorm:"column:data_list" description:"数据列表"`
+	DataList            interface{} `gorm:"-" description:"数据列表"`
 	EdbInfoCategoryType int         `gorm:"column:edb_info_category_type" description:"0:普通指标,1:预测指标"`
 	PredictChartColor   string      `gorm:"column:predict_chart_color" description:"预测数据的颜色"`
 	ChartType           int         `gorm:"column:chart_type" description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图"`
@@ -220,7 +220,7 @@ type ChartEdbInfoMapping struct {
 	UniqueCode          string      `gorm:"column:unique_code" description:"指标唯一编码"`
 	MinValue            float64     `gorm:"column:min_value" json:"-" description:"最小值"`
 	MaxValue            float64     `gorm:"column:max_value" json:"-" description:"最大值"`
-	IsNullData          bool        `gorm:"column:is_null_data" json:"-" description:"是否空数据"`
+	IsNullData          bool        `gorm:"column:-" json:"-" description:"是否空数据"`
 	MappingSource       int         `gorm:"column:mapping_source" description:"1：ETA图库；2：商品价格曲线"`
 	SubSource           int         `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
 	SubSourceName       string      `gorm:"column:sub_source_name" description:"子数据来源名称"`

models/chart_edb_mapping.go

@@ -16,6 +16,12 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).First(&item).Error
+	if err != nil {
+		return
+	}
+	// 格式化时间字符串格式
+	item.ConvertToResp()
+
 	return
 }
 
@@ -30,6 +36,14 @@ func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Scan(&items).Error
+	if err != nil {
+		return
+	}
+	for _, v := range items {
+		// 格式化时间字符串格式
+		v.ConvertToResp()
+	}
+
 	return
 }
 
@@ -43,6 +57,12 @@ func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).First(&item).Error
+	if err != nil {
+		return
+	}
+
+	item.ConvertToResp()
+
 	return
 }
 
@@ -56,6 +76,15 @@ func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfo
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Scan(&items).Error
+	if err != nil {
+		return
+	}
+
+	for _, v := range items {
+		// 格式化时间字符串格式
+		v.ConvertToResp()
+	}
+
 	return
 }
 
@@ -66,6 +95,12 @@ func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, er
              FROM edb_info
 			 WHERE edb_info_id = ? limit 1`
 	err = o.Raw(sql, edbInfoId).First(&item).Error
+	if err != nil {
+		return
+	}
+	// 格式化时间字符串格式
+	item.ConvertToResp()
+
 	return
 }
 
@@ -87,84 +122,14 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 		pars = append(pars, v)
 	}
 	err = o.Raw(sql, pars...).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	for _, v := range list {
+		// 格式化时间字符串格式
+		v.ConvertToResp()
+	}
+
 	return
 }
-
-// func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-// 	o := orm.NewOrmUsingDB("data")
-
-// 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
-// 	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type
-//              FROM chart_edb_mapping AS a
-// 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
-// 			 WHERE a.chart_info_id=? AND a.source = ?
-//              ORDER BY chart_edb_mapping_id ASC `
-// 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRow(&item)
-// 	return
-// }
-
-// // GetEtaEdbChartEdbMappingList       商品曲线图查询对应的普通指标
-// func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
-// 	o := orm.NewOrmUsingDB("data")
-// 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
-
-// 	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.classify_id,b.is_join_permission
-//              FROM chart_edb_mapping AS a
-// 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
-// 			 WHERE a.chart_info_id=? AND a.source = ?
-//              ORDER BY chart_edb_mapping_id ASC `
-// 	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRows(&items)
-// 	return
-// }
-
-// // GetFutureGoodEdbChartEdbMapping       商品曲线图查询对应的商品指标
-// func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-// 	o := orm.NewOrmUsingDB("data")
-// 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
-// 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
-//              FROM chart_edb_mapping AS a
-// 			 INNER JOIN future_good_edb_info AS b ON a.edb_info_id=b.future_good_edb_info_id
-// 			 WHERE a.chart_info_id=? AND a.source = ?
-//              ORDER BY chart_edb_mapping_id ASC `
-// 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRow(&item)
-// 	return
-// }
-
-// // GetFutureGoodEdbChartEdbMappingList       商品曲线图查询对应的商品指标
-// func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
-// 	o := orm.NewOrmUsingDB("data")
-// 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
-// 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
-//              FROM chart_edb_mapping AS a
-// 			 INNER JOIN future_good_edb_info AS b ON a.edb_info_id=b.future_good_edb_info_id
-// 			 WHERE a.chart_info_id=? AND a.source = ?
-//              ORDER BY chart_edb_mapping_id ASC `
-// 	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRows(&items)
-// 	return
-// }
-
-// // GetChartEdbMappingByEdbInfoId 根据指标id获取edb_mapping
-// func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
-// 	o := orm.NewOrmUsingDB("data")
-// 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value
-//              FROM edb_info
-// 			 WHERE edb_info_id = ? limit 1`
-// 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-// 	return
-// }
-
-// // GetChartEdbMappingListByEdbInfoIdList 根据指标id列表获取关联关系
-// func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInfoMapping, err error) {
-// 	num := len(edbIdList)
-// 	if num <= 0 {
-// 		return
-// 	}
-// 	o := orm.NewOrmUsingDB("data")
-// 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type
-//              FROM edb_info
-// 			 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
-// 			ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `)
-//               `
-// 	_, err = o.Raw(sql, edbIdList, edbIdList).QueryRows(&list)
-// 	return
-// }