fix；日期格式转换

models/chart.go

@@ -235,6 +235,14 @@ type ChartEdbInfoMapping struct {
 	IsJoinPermission    int         `gorm:"column:is_join_permission" description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
 }
 
+func (e *ChartEdbInfoMapping) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateTimeStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateTimeStr(e.EndDate)
+	e.LatestDate = utils.GormDateStrToDateTimeStr(e.LatestDate)
+
+	return
+}
+
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
 	o := global.DmSQL["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,a.edb_alias_name`
@@ -244,7 +252,7 @@ a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+	err = o.Raw(sql, chartInfoId).Find(&list).Error
 	return
 }
 

models/chart_edb_mapping.go

@@ -35,7 +35,7 @@ func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping
 			 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).Scan(&items).Error
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -75,7 +75,7 @@ func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfo
 			 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).Scan(&items).Error
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -121,7 +121,7 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	for _, v := range edbIdList {
 		pars = append(pars, v)
 	}
-	err = o.Raw(sql, pars...).Scan(&list).Error
+	err = o.Raw(sql, pars...).Find(&list).Error
 	if err != nil {
 		return
 	}

models/data_manage/chart_info.go

@@ -1,6 +1,10 @@
 package data_manage
 
-import "eta_gn/eta_chart_lib/global"
+import (
+	"eta_gn/eta_chart_lib/global"
+	"eta_gn/eta_chart_lib/utils"
+	"gorm.io/gorm"
+)
 
 //	type ChartEdbInfoMapping struct {
 //		EdbInfoId           int     `description:"指标id"`
@@ -85,6 +89,14 @@ type ChartEdbInfoMapping struct {
 	IsNullData          bool        `gorm:"-" json:"-" description:"是否空数据"`
 }
 
+func (e *ChartEdbInfoMapping) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateTimeStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateTimeStr(e.EndDate)
+	e.LatestDate = utils.GormDateStrToDateTimeStr(e.LatestDate)
+
+	return
+}
+
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
 	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.source_name,b.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
@@ -92,7 +104,7 @@ func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err e
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+	err = o.Raw(sql, chartInfoId).Find(&list).Error
 	return
 }
 

models/data_manage/chart_theme/chart_theme.go

@@ -161,7 +161,7 @@ func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err er
 	o := global.DmSQL["data"]
 
 	sql := `SELECT * FROM chart_theme WHERE chart_theme_type_id = ? AND  is_delete=0 ORDER BY chart_theme_id ASC `
-	err = o.Raw(sql, chartThemeTypeId).Scan(&list).Error
+	err = o.Raw(sql, chartThemeTypeId).Find(&list).Error
 	return
 }
 
@@ -188,7 +188,7 @@ func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err er
 func GetAllChartThemeList() (list []*ChartTheme, err error) {
 	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_theme WHERE  is_delete=0 ORDER BY chart_theme_id ASC `
-	err = o.Raw(sql).Scan(&list).Error
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -258,7 +258,7 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a 
          JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id 
          WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
-	err = o.Raw(sql, chartThemeTypeId).Scan(&list).Error
+	err = o.Raw(sql, chartThemeTypeId).Find(&list).Error
 	return
 }
 

models/data_manage/edb_info_calculate.go

@@ -37,7 +37,7 @@ func GetEdbInfoAllCalculateByEdbInfoIdList(edbInfoIdList []int) (list []*EdbInfo
              WHERE a.from_edb_info_id in (` + utils.GetGormInReplace(num) + `)
 			 GROUP BY a.edb_info_id
 			 ORDER BY a.edb_info_id ASC `
-	err = o.Raw(sql, edbInfoIdList).Scan(&list).Error
+	err = o.Raw(sql, edbInfoIdList).Find(&list).Error
 	return
 }
 
@@ -127,7 +127,7 @@ func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoC
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).Scan(&items).Error
+	err = o.Raw(sql, edbInfoId).Find(&items).Error
 	return
 }