fix：时间转换

models/data_manage/chart_edb_mapping.go

@@ -43,7 +43,9 @@ func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {
 	return
 }
 
-func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.classify_id,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.edb_type,b.is_join_permission,
@@ -52,7 +54,14 @@ 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).QueryRows(&list)
+	_, err = o.Raw(sql, chartInfoId).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -66,34 +75,56 @@ func GetChartMappingList(chartInfoId int) (list []*ChartEdbMapping, err error) {
 	return
 }
 
-func GetChartEdbMappingListByChartInfoIds(chartInfoIds string) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingListByChartInfoIds(chartInfoIds string) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,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.edb_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 chart_info_id in (` + chartInfoIds + `) 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	_, err = o.Raw(sql).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
-func GetChartEdbMappingListByEdbInfoId(edbInfoStr string) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingListByEdbInfoId(edbInfoStr string) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	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,classify_id,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id IN(` + edbInfoStr + `)
 			ORDER BY FIELD(edb_info_id,` + edbInfoStr + `)
               `
-	_, err = o.Raw(sql).QueryRows(&list)
+	_, err = o.Raw(sql).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetChartEdbMappingListByEdbInfoIdList 根据指标id列表获取关联关系
-func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (items []*ChartEdbInfoMapping, err error) {
 	num := len(edbIdList)
 	if num <= 0 {
 		return
 	}
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	o := orm.NewOrmUsingDB("data")
 
 	if utils.DBDRIVER_NAME == "postgres" {
@@ -107,32 +138,52 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 		}
 		sql += ` END`
 
-		_, err = o.Raw(sql, edbIdList).QueryRows(&list)
-		return
+		_, err = o.Raw(sql, edbIdList).QueryRows(&ormList)
+		if err != nil {
+			return
+		}
+		for _, ormItem := range ormList {
+			items = append(items, ormItem.ToItem())
+		}
 	} else {
 		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,classify_id,is_join_permission
 		        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
+		_, err = o.Raw(sql, edbIdList, edbIdList).QueryRows(&ormList)
+		if err != nil {
+			return
+		}
+		for _, ormItem := range ormList {
+			items = append(items, ormItem.ToItem())
+		}
 	}
 
+	return
 }
 
 // GetChartEdbMappingListByIdList 通过图表id列表获取
-func GetChartEdbMappingListByIdList(chartInfoIdList []int) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingListByIdList(chartInfoIdList []int) (items []*ChartEdbInfoMapping, err error) {
 	num := len(chartInfoIdList)
 	if num <= 0 {
 		return
 	}
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,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,b.edb_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 chart_info_id in (` + utils.GetOrmInReplace(num) + `) 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoIdList).QueryRows(&list)
+	_, err = o.Raw(sql, chartInfoIdList).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -142,7 +193,10 @@ type RelationEdbInfoListResp struct {
 	List   []*ChartEdbInfoMapping
 }
 
-func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartEdbInfoMapping, err error) {
+func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
@@ -151,7 +205,14 @@ func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, sta
 	}
 	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
 	sql += " ORDER BY a.create_time DESC LIMIT ?,? "
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -168,6 +229,7 @@ func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}
 
 // GetEtaEdbChartEdbMapping       商品曲线图查询对应的普通指标
 func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
+	var chartEdbInfoMappingOrm *ChartEdbInfoMappingOrm
 	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`
 
@@ -176,12 +238,20 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 			 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)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRow(&chartEdbInfoMappingOrm)
+	if err != nil {
+		return
+	}
+	item = chartEdbInfoMappingOrm.ToItem()
+
 	return
 }
 
 // GetEtaEdbChartEdbMappingList       商品曲线图查询对应的普通指标
 func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	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`
 
@@ -190,12 +260,20 @@ 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).QueryRows(&items)
+	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetFutureGoodEdbChartEdbMapping       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
+	var chartEdbInfoMappingOrm *ChartEdbInfoMappingOrm
 	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
@@ -203,12 +281,19 @@ func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping
 			 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)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRow(&chartEdbInfoMappingOrm)
+	if err != nil {
+		return
+	}
+	item = chartEdbInfoMappingOrm.ToItem()
+
 	return
 }
 
 // GetFutureGoodEdbChartEdbMappingList       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
 	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
@@ -216,46 +301,85 @@ 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).QueryRows(&items)
+	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetChartEdbMappingListV2 根据图表id获取指标信息,不连表查询指标表
-func GetChartEdbMappingListV2(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
+func GetChartEdbMappingListV2(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	_, err = o.Raw(sql, chartInfoId).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetChartEdbMappingByEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
+	var chartEdbInfoMappingOrm *ChartEdbInfoMappingOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT edb_info_id,source_name,classify_id,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,edb_type,max_value,min_value,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id = ? limit 1`
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).QueryRow(&chartEdbInfoMappingOrm)
+	if err != nil {
+		return
+	}
+	item = chartEdbInfoMappingOrm.ToItem()
+
 	return
 }
 
 // GetEdbMappingListByEdbInfoId 根据指标id获取edb_mapping
-func GetEdbMappingListByEdbInfoId(edbInfoId int) (item []*ChartEdbInfoMapping, err error) {
+func GetEdbMappingListByEdbInfoId(edbInfoId int) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_edb_mapping
 			 WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&item)
+	_, err = o.Raw(sql, edbInfoId).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
 // GetChartEdbMappingByFutureGoodEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
+	var chartEdbInfoMappingOrm *ChartEdbInfoMappingOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT future_good_edb_info_id as edb_info_id,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,b.region_type
              FROM future_good_edb_info b
 			 WHERE future_good_edb_info_id = ?  limit 1 `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).QueryRow(&chartEdbInfoMappingOrm)
+	if err != nil {
+		return
+	}
+	item = chartEdbInfoMappingOrm.ToItem()
+
 	return
 }
 
@@ -357,13 +481,23 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 	return
 }
 
-func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (item []*ChartEdbInfoMapping, err error) {
+func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (items []*ChartEdbInfoMapping, err error) {
+	var ormList []*ChartEdbInfoMappingOrm
+	items = make([]*ChartEdbInfoMapping, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }

models/data_manage/chart_info.go

@@ -119,10 +119,19 @@ func GetChartInfoByAdminId(sourceList []int, adminId int) (items []*ChartClassif
 
 // 用于分类展示
 func GetChartInfoAllList() (items []*ChartInfo, err error) {
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *
             FROM chart_info ORDER BY create_time ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -145,23 +154,44 @@ type ChartInfoSearchResp struct {
 }
 
 func GetChartInfoById(chartInfoId int) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id=? `
-	err = o.Raw(sql, chartInfoId).QueryRow(&item)
+	err = o.Raw(sql, chartInfoId).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
 func GetChartInfoViewById(chartInfoId int) (item *ChartInfoView, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id=? `
-	err = o.Raw(sql, chartInfoId).QueryRow(&item)
+	err = o.Raw(sql, chartInfoId).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToInfoView()
+
 	return
 }
 
-func GetChartInfoViewByIds(chartInfoIds []string) (list []*ChartInfoView, err error) {
+func GetChartInfoViewByIds(chartInfoIds []string) (items []*ChartInfoView, err error) {
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfoView, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in ("` + strings.Join(chartInfoIds, `","`) + `") `
-	_, err = o.Raw(sql).QueryRows(&list)
+	_, err = o.Raw(sql).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToInfoView())
+	}
+
 	return
 }
 
@@ -398,12 +428,18 @@ type ChartInfoListResp struct {
 }
 
 func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
@@ -1740,7 +1776,9 @@ func ChartInfoExist(condition, edbInfoIdStr string) (count int, err error) {
 	return
 }
 
-func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*ChartInfo, err error) {
+func ChartInfoSearchByKeyWord(keyword string, showSysId int) (items []*ChartInfo, err error) {
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 
@@ -1759,7 +1797,14 @@ func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*Char
 	if keyword == "" {
 		sql += ` LIMIT 100 `
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&searchList)
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -1801,13 +1846,19 @@ func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermission
 }
 
 func GetNextChartInfo(classifyId int) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.* FROM chart_classify AS a
 			INNER JOIN chart_info AS b ON a.chart_classify_id=b.chart_classify_id
 			WHERE a.chart_classify_id>?
 			ORDER BY a.chart_classify_id ASC
 			LIMIT 1 `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
@@ -1909,24 +1960,42 @@ type FutureChartInfoDetailFromUniqueCodeResp struct {
 }
 
 func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
-	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	err = o.Raw(sql, uniqueCode).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
 func GetChartInfoViewByUniqueCode(uniqueCode string) (item *ChartInfoView, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code=? `
-	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	err = o.Raw(sql, uniqueCode).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToInfoView()
+
 	return
 }
 
 // GetFirstChartInfoByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstChartInfoByClassifyId(classifyId int) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_classify_id=? order by sort asc,chart_info_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
@@ -2040,9 +2109,15 @@ type ImageSvgToPngResp struct {
 
 // GetChartInfoByClassifyIdAndName 根据分类id和图表名获取图表信息
 func GetChartInfoByClassifyIdAndName(classifyId int, chartName string) (item *ChartInfo, err error) {
+	var chartInfoOrm *ChartInfoOrm
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_classify_id = ? and chart_name=? `
-	err = o.Raw(sql, classifyId, chartName).QueryRow(&item)
+	err = o.Raw(sql, classifyId, chartName).QueryRow(&chartInfoOrm)
+	if err != nil {
+		return
+	}
+	item = chartInfoOrm.ToItem()
+
 	return
 }
 
@@ -2059,9 +2134,19 @@ func GetChartInfoListByUniqueCodeSlice(uniqueCodeSlice []string) (total int64, i
 	if len(uniqueCodeSlice) <= 0 {
 		return
 	}
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE unique_code in ("` + strings.Join(uniqueCodeSlice, `","`) + `") `
-	total, err = o.Raw(sql).QueryRows(&items)
+	total, err = o.Raw(sql).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -2114,13 +2199,23 @@ type ChartInfoListByEsResp struct {
 
 // GetChartInfoListByCondition 根据条件获取图表数据了列表
 func GetChartInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*ChartInfo, err error) {
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY chart_info_id DESC LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -2130,10 +2225,19 @@ func GetChartInfoListGroupByUserId(edbIdList []string) (items []*ChartInfo, err
 	if num <= 0 {
 		return
 	}
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
-	_, err = o.Raw(sql, edbIdList).QueryRows(&items)
+	_, err = o.Raw(sql, edbIdList).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -2147,10 +2251,19 @@ func GetChartInfoListByChartIdList(charIdList []string) (items []*ChartInfo, err
 	if num <= 0 {
 		return
 	}
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
-	_, err = o.Raw(sql, charIdList).QueryRows(&items)
+	_, err = o.Raw(sql, charIdList).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -2166,9 +2279,18 @@ func GetChartInfoListByUserId(userIdList []int, source int) (items []*ChartInfo,
 		return
 	}
 	o := orm.NewOrmUsingDB("data")
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	sql := ` SELECT * FROM chart_info WHERE source = ? AND  sys_user_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_info_id desc `
 
-	_, err = o.Raw(sql, source, userIdList).QueryRows(&items)
+	_, err = o.Raw(sql, source, userIdList).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 
@@ -2951,13 +3073,22 @@ type ModifyChartListReq struct {
 	ChartTypeIds     string
 }
 
-func GetChartInfoItemsByCondition(condition string, pars []interface{}) (item []*ChartInfo, err error) {
+func GetChartInfoItemsByCondition(condition string, pars []interface{}) (items []*ChartInfo, err error) {
+	var ormList []*ChartInfoOrm
+	items = make([]*ChartInfo, 0)
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToItem())
+	}
+
 	return
 }
 

models/data_manage/chart_orm.go

@@ -0,0 +1,295 @@
+package data_manage
+
+import (
+	"eta/eta_api/utils"
+	"time"
+)
+
+type ChartInfoOrm struct {
+	ChartInfoId       int    `orm:"column(chart_info_id);pk;auto"`
+	ChartName         string `description:"图表名称"`
+	ChartNameEn       string `description:"英文图表名称"`
+	ChartClassifyId   int    `description:"图表分类id"`
+	SysUserId         int
+	SysUserRealName   string
+	UniqueCode        string `description:"图表唯一编码"`
+	CreateTime        time.Time
+	ModifyTime        time.Time
+	DateType          int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate         time.Time `description:"自定义开始日期"`
+	EndDate           time.Time `description:"自定义结束日期"`
+	IsSetName         int       `description:"设置名称"`
+	EdbInfoIds        string    `description:"指标id"`
+	ChartType         int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图，10:截面散点图, 11：雷达图"`
+	Calendar          string    `description:"公历/农历"`
+	SeasonStartDate   time.Time `description:"季节性图开始日期"`
+	SeasonEndDate     time.Time `description:"季节性图开始日期"`
+	ChartImage        string    `description:"图表图片"`
+	Sort              int       `description:"排序字段，数字越小越排前面"`
+	XMin              string    `description:"图表X轴最小值"`
+	XMax              string    `description:"图表X轴最大值"`
+	LeftMin           string    `description:"图表左侧最小值"`
+	LeftMax           string    `description:"图表左侧最大值"`
+	RightMin          string    `description:"图表右侧最小值"`
+	RightMax          string    `description:"图表右侧最大值"`
+	Right2Min         string    `description:"图表右侧2最小值"`
+	Right2Max         string    `description:"图表右侧2最大值"`
+	MinMaxSave        int       `description:"是否手动保存过上下限：0-否；1-是"`
+	Disabled          int       `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig         string    `description:"柱方图的配置，json数据"`
+	Source            int       `description:"1：ETA图库；2：商品价格曲线"`
+	ExtraConfig       string    `description:"图表额外配置,json数据"`
+	SeasonExtraConfig string    `description:"季节性图表中的配置,json数据"`
+	StartYear         int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	ChartThemeId      int       `description:"图表应用主题ID"`
+	SourcesFrom       string    `description:"图表来源"`
+	Instructions      string    `description:"图表说明"`
+	MarkersLines      string    `description:"标识线"`
+	MarkersAreas      string    `description:"标识区"`
+	Unit              string    `description:"中文单位名称"`
+	UnitEn            string    `description:"英文单位名称"`
+	IsJoinPermission  int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	ForumChartInfoId  int       `description:"社区的图表ID"`
+	ChartAlias        string    `description:"图表别名"`
+	DateTypeNum       int       `description:"date_type=25(N月前)时的N值,其他N值可复用此字段"`
+}
+
+func (m *ChartInfoOrm) ToItem() (item *ChartInfo) {
+	item = &ChartInfo{
+		ChartInfoId:       m.ChartInfoId,
+		ChartName:         m.ChartName,
+		ChartNameEn:       m.ChartNameEn,
+		ChartClassifyId:   m.ChartClassifyId,
+		SysUserId:         m.SysUserId,
+		SysUserRealName:   m.SysUserRealName,
+		UniqueCode:        m.UniqueCode,
+		CreateTime:        m.CreateTime,
+		ModifyTime:        m.ModifyTime,
+		DateType:          m.DateType,
+		StartDate:         m.StartDate.Format(utils.FormatDate),
+		EndDate:           m.EndDate.Format(utils.FormatDate),
+		IsSetName:         m.IsSetName,
+		EdbInfoIds:        m.EdbInfoIds,
+		ChartType:         m.ChartType,
+		Calendar:          m.Calendar,
+		SeasonStartDate:   m.SeasonStartDate.Format(utils.FormatDate),
+		SeasonEndDate:     m.SeasonEndDate.Format(utils.FormatDate),
+		ChartImage:        m.ChartImage,
+		Sort:              m.Sort,
+		XMin:              m.XMin,
+		XMax:              m.XMax,
+		LeftMin:           m.LeftMin,
+		LeftMax:           m.LeftMax,
+		RightMin:          m.RightMin,
+		RightMax:          m.RightMax,
+		Right2Min:         m.Right2Min,
+		Right2Max:         m.Right2Max,
+		MinMaxSave:        m.MinMaxSave,
+		Disabled:          m.Disabled,
+		BarConfig:         m.BarConfig,
+		Source:            m.Source,
+		ExtraConfig:       m.ExtraConfig,
+		SeasonExtraConfig: m.SeasonExtraConfig,
+		StartYear:         m.StartYear,
+		ChartThemeId:      m.ChartThemeId,
+		SourcesFrom:       m.SourcesFrom,
+		Instructions:      m.Instructions,
+		MarkersLines:      m.MarkersLines,
+		MarkersAreas:      m.MarkersAreas,
+		Unit:              m.Unit,
+		UnitEn:            m.UnitEn,
+		IsJoinPermission:  m.IsJoinPermission,
+		ForumChartInfoId:  m.ForumChartInfoId,
+		ChartAlias:        m.ChartAlias,
+		DateTypeNum:       m.DateTypeNum,
+	}
+
+	return
+}
+
+func (m *ChartInfoOrm) ToInfoView() (item *ChartInfoView) {
+	item = &ChartInfoView{
+		ChartInfoId:     m.ChartInfoId,
+		ChartName:       m.ChartName,
+		ChartNameEn:     m.ChartNameEn,
+		Unit:            m.Unit,
+		UnitEn:          m.UnitEn,
+		ChartClassifyId: m.ChartClassifyId,
+		//ChartClassifyName: "",
+		SysUserId:       m.SysUserId,
+		SysUserRealName: m.SysUserRealName,
+		UniqueCode:      m.UniqueCode,
+		CreateTime:      m.CreateTime,
+		ModifyTime:      m.ModifyTime,
+		DateType:        m.DateType,
+		StartDate:       m.StartDate.Format(utils.FormatDate),
+		EndDate:         m.EndDate.Format(utils.FormatDate),
+		IsSetName:       m.IsSetName,
+		EdbInfoIds:      m.EdbInfoIds,
+		ChartType:       m.ChartType,
+		Calendar:        m.Calendar,
+		SeasonStartDate: m.SeasonStartDate.Format(utils.FormatDate),
+		SeasonEndDate:   m.SeasonEndDate.Format(utils.FormatDate),
+		ChartImage:      m.ChartImage,
+		Sort:            m.Sort,
+		//IsAdd:             ,
+		//MyChartId:         0,
+		//MyChartClassifyId: "",
+		//ChartClassify:     nil,
+		//EdbEndDate:        "",
+		XMin:       m.XMin,
+		XMax:       m.XMax,
+		LeftMin:    m.LeftMin,
+		LeftMax:    m.LeftMax,
+		RightMin:   m.RightMin,
+		RightMax:   m.RightMax,
+		Right2Min:  m.Right2Min,
+		Right2Max:  m.Right2Max,
+		MinMaxSave: m.MinMaxSave,
+		//IsEdit:            false,
+		//IsEnChart:         false,
+		//WarnMsg:           "",
+		Disabled:      m.Disabled,
+		BarConfig:     m.BarConfig,
+		Source:        m.Source,
+		ExtraConfig:   m.ExtraConfig,
+		ChartSource:   "",
+		ChartSourceEn: "",
+		//Button:            ChartViewButton{},
+		SeasonExtraConfig: m.SeasonExtraConfig,
+		StartYear:         m.StartYear,
+		ChartThemeId:      m.ChartThemeId,
+		//ChartThemeStyle:   "",
+		SourcesFrom:      m.SourcesFrom,
+		Instructions:     m.Instructions,
+		MarkersLines:     m.MarkersLines,
+		MarkersAreas:     m.MarkersAreas,
+		IsJoinPermission: m.IsJoinPermission,
+		//HaveOperaAuth:     false,
+		ForumChartInfoId: m.ForumChartInfoId,
+		ChartAlias:       m.ChartAlias,
+		DateTypeNum:      m.DateTypeNum,
+		//ChartTypeName:     m.ChartTypeName,
+		//ChartTypeNameEn:   "",
+	}
+
+	return
+}
+
+type ChartEdbInfoMappingOrm struct {
+	EdbInfoId           int       `description:"指标id"`
+	SourceName          string    `description:"来源名称"`
+	Source              int       `description:"来源id"`
+	SubSource           int       `description:"来源id"`
+	EdbCode             string    `description:"指标编码"`
+	EdbName             string    `description:"指标名称"`
+	EdbAliasName        string    `description:"指标名称（别名）"`
+	EdbNameEn           string    `description:"英文指标名称"`
+	EdbAliasNameEn      string    `description:"英文指标名称（别名）"`
+	EdbType             int       `description:"指标类型:1:基础指标,2:计算指标"`
+	Frequency           string    `description:"频率"`
+	FrequencyEn         string    `description:"英文频率"`
+	Unit                string    `description:"单位"`
+	UnitEn              string    `description:"英文单位"`
+	StartDate           time.Time `description:"起始日期"`
+	EndDate             time.Time `description:"终止日期"`
+	ModifyTime          time.Time `description:"指标最后更新时间"`
+	ChartEdbMappingId   int       `description:"图表指标id"`
+	ChartInfoId         int       `description:"图表id"`
+	MaxData             float64   `description:"上限"`
+	MinData             float64   `description:"下限"`
+	IsOrder             bool      `description:"true:正序,false:逆序"`
+	IsAxis              int       `description:"1:左轴,0:右轴"`
+	EdbInfoType         int       `description:"1:标准指标,0:领先指标"`
+	EdbInfoCategoryType int       `description:"0:普通指标,1:预测指标"`
+	LeadValue           int       `description:"领先值"`
+	LeadUnit            string    `description:"领先单位"`
+	LeadUnitEn          string    `description:"领先英文单位"`
+	ChartStyle          string    `description:"图表类型"`
+	ChartColor          string    `description:"颜色"`
+	PredictChartColor   string    `description:"预测数据的颜色"`
+	ChartWidth          float64   `description:"线条大小"`
+	ChartType           int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
+	LatestDate          time.Time `description:"数据最新日期"`
+	LatestValue         float64   `description:"数据最新值"`
+	MoveLatestDate      time.Time `description:"移动后的数据最新日期"`
+	UniqueCode          string    `description:"指标唯一编码"`
+	MinValue            float64   `json:"-" description:"最小值"`
+	MaxValue            float64   `json:"-" description:"最大值"`
+	DataList            interface{}
+	IsNullData          bool    `json:"-" description:"是否空数据"`
+	MappingSource       int     `description:"1：ETA图库；2：商品价格曲线"`
+	RegionType          string  `description:"交易所来源，海外还是国内" json:"-"`
+	ClassifyId          int     `description:"分类id"`
+	SubSourceName       string  `description:"子数据来源名称"`
+	IndicatorCode       string  `description:"指标代码"`
+	IsConvert           int     `description:"是否数据转换 0不转 1转"`
+	ConvertType         int     `description:"数据转换类型 1乘 2除 3对数"`
+	ConvertValue        float64 `description:"数据转换值"`
+	ConvertUnit         string  `description:"数据转换单位"`
+	ConvertEnUnit       string  `description:"数据转换单位"`
+	IsJoinPermission    int     `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	HaveOperaAuth       bool    `description:"是否有数据权限，默认：false"`
+	UniqueFlag          string  `description:"唯一标识(与唯一编码不是一个东西)"`
+}
+
+func (m *ChartEdbInfoMappingOrm) ToItem() (item *ChartEdbInfoMapping) {
+	item = &ChartEdbInfoMapping{
+		EdbInfoId:           m.EdbInfoId,
+		SourceName:          m.SourceName,
+		Source:              m.Source,
+		SubSource:           m.SubSource,
+		EdbCode:             m.EdbCode,
+		EdbName:             m.EdbName,
+		EdbAliasName:        m.EdbAliasName,
+		EdbNameEn:           m.EdbNameEn,
+		EdbAliasNameEn:      m.EdbAliasNameEn,
+		EdbType:             m.EdbType,
+		Frequency:           m.Frequency,
+		FrequencyEn:         m.FrequencyEn,
+		Unit:                m.Unit,
+		UnitEn:              m.UnitEn,
+		StartDate:           m.StartDate.Format(utils.FormatDate),
+		EndDate:             m.EndDate.Format(utils.FormatDate),
+		ModifyTime:          m.ModifyTime.Format(utils.FormatDateTime),
+		ChartEdbMappingId:   m.ChartEdbMappingId,
+		ChartInfoId:         m.ChartInfoId,
+		MaxData:             m.MaxData,
+		MinData:             m.MinData,
+		IsOrder:             m.IsOrder,
+		IsAxis:              m.IsAxis,
+		EdbInfoType:         m.EdbInfoType,
+		EdbInfoCategoryType: m.EdbInfoCategoryType,
+		LeadValue:           m.LeadValue,
+		LeadUnit:            m.LeadUnit,
+		LeadUnitEn:          m.LeadUnitEn,
+		ChartStyle:          m.ChartStyle,
+		ChartColor:          m.ChartColor,
+		PredictChartColor:   m.PredictChartColor,
+		ChartWidth:          m.ChartWidth,
+		ChartType:           m.ChartType,
+		LatestDate:          m.LatestDate.Format(utils.FormatDate),
+		LatestValue:         m.LatestValue,
+		MoveLatestDate:      m.MoveLatestDate.Format(utils.FormatDate),
+		UniqueCode:          m.UniqueCode,
+		MinValue:            m.MinValue,
+		MaxValue:            m.MaxValue,
+		DataList:            m.DataList,
+		IsNullData:          m.IsNullData,
+		MappingSource:       m.MappingSource,
+		RegionType:          m.RegionType,
+		ClassifyId:          m.ClassifyId,
+		SubSourceName:       m.SubSourceName,
+		IndicatorCode:       m.IndicatorCode,
+		IsConvert:           m.IsConvert,
+		ConvertType:         m.ConvertType,
+		ConvertValue:        m.ConvertValue,
+		ConvertUnit:         m.ConvertUnit,
+		ConvertEnUnit:       m.ConvertEnUnit,
+		IsJoinPermission:    m.IsJoinPermission,
+		HaveOperaAuth:       m.HaveOperaAuth,
+		UniqueFlag:          m.UniqueFlag,
+	}
+
+	return
+}

models/data_manage/edb_info_orm.go

@@ -1,6 +1,8 @@
 package data_manage
 
-import "eta/eta_api/utils"
+import (
+	"eta/eta_api/utils"
+)
 
 func (m *EdbInfoOrm) ToList() (edbInfoList *EdbInfoList) {
 	edbInfoList = &EdbInfoList{