fix

models/data_source/data_source.go

@@ -150,7 +150,7 @@ func GetEsBaseFromIndexByTableName(tableName string) EsBaseFromIndex {
 
 // BaseFromRzdIndex 睿咨得
 type BaseFromRzdIndex struct {
-	BaseFromRzdIndexId    int       `orm:"column(base_from_rzd_index_id);pk" gorm:"primaryKey"`
+	BaseFromRzdIndexId    int       `gorm:"column:base_from_rzd_index_id;primaryKey"`
 	BaseFromRzdClassifyId int       `description:"分类ID"`
 	IndexCode             string    `description:"指标编码"`
 	IndexName             string    `description:"指标名称"`
@@ -223,7 +223,7 @@ func (m *BaseFromRzdIndex) GetItemsByCondition(condition string, pars []interfac
 
 // BaseFromHisugarIndex 泛糖科技
 type BaseFromHisugarIndex struct {
-	BaseFromHisugarIndexId int       `orm:"column(base_from_hisugar_index_id);pk" gorm:"primaryKey"`
+	BaseFromHisugarIndexId int       `gorm:"column:base_from_hisugar_index_id;primaryKey"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -299,7 +299,7 @@ func (m *BaseFromHisugarIndex) GetItemsByCondition(condition string, pars []inte
 
 // BaseFromLyIndex 粮油商务网
 type BaseFromLyIndex struct {
-	BaseFromLyIndexId    int       `orm:"column(base_from_ly_index_id);pk" gorm:"primaryKey"`
+	BaseFromLyIndexId    int       `gorm:"column:base_from_ly_index_id;primaryKey"`
 	BaseFromLyClassifyId int       `description:"分类ID"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
@@ -373,7 +373,7 @@ func (m *BaseFromLyIndex) GetItemsByCondition(condition string, pars []interface
 
 // BaseFromSciHqIndex 卓创红期
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk" gorm:"primaryKey"`
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id;primaryKey"`
 	ClassifyId           int       `description:"分类ID"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
@@ -450,7 +450,7 @@ func (m *BaseFromSciHqIndex) GetItemsByCondition(condition string, pars []interf
 
 // BaseFromOilchemIndex 隆众资讯
 type BaseFromOilchemIndex struct {
-	BaseFromOilchemIndexId int       `orm:"column(base_from_oilchem_index_id);pk" gorm:"primaryKey"`
+	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id;primaryKey"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -523,7 +523,7 @@ func (m *BaseFromOilchemIndex) GetItemsByCondition(condition string, pars []inte
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk" gorm:"primaryKey"`
+	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey"`
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`
@@ -606,7 +606,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 
 // BaseFromCcfIndex CCF化纤信息
 type BaseFromCcfIndex struct {
-	BaseFromCcfIndexId int       `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey"`
+	BaseFromCcfIndexId int       `gorm:"column:base_from_ccf_index_id;primaryKey"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -679,7 +679,7 @@ func (m *BaseFromCcfIndex) GetItemsByCondition(condition string, pars []interfac
 
 // BaseFromUsdaFasIndex 美国农业部
 type BaseFromUsdaFasIndex struct {
-	BaseFromUsdaFasIndexId int       `orm:"column(base_from_usda_fas_index_id);pk" gorm:"primaryKey"`
+	BaseFromUsdaFasIndexId int       `gorm:"column:base_from_usda_fas_index_id;primaryKey"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -752,7 +752,7 @@ func (m *BaseFromUsdaFasIndex) GetItemsByCondition(condition string, pars []inte
 
 // BaseFromMysteelChemicalIndex 上海钢联
 type BaseFromMysteelChemicalIndex struct {
-	BaseFromMysteelChemicalIndexId    int       `orm:"column(base_from_mysteel_chemical_index_id);pk" gorm:"primaryKey"`
+	BaseFromMysteelChemicalIndexId    int       `gorm:"column:base_from_mysteel_chemical_index_id;primaryKey"`
 	BaseFromMysteelChemicalClassifyId int       `description:"分类ID"`
 	IndexCode                         string    `description:"指标编码"`
 	IndexName                         string    `description:"指标名称"`
@@ -825,7 +825,7 @@ func (m *BaseFromMysteelChemicalIndex) GetItemsByCondition(condition string, par
 
 // BaseFromSmmIndex 有色原始数据库
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int       `orm:"column(base_from_smm_index_id);pk" gorm:"primaryKey"`
+	BaseFromSmmIndexId int       `gorm:"column:base_from_smm_index_id;primaryKey"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -898,7 +898,7 @@ func (m *BaseFromSmmIndex) GetItemsByCondition(condition string, pars []interfac
 
 // BaseFromBaiinfoIndex 百川盈孚
 type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int       `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey"`
+	BaseFromBaiinfoIndexId int       `gorm:"column:base_from_baiinfo_index_id;primaryKey"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -971,7 +971,7 @@ func (m *BaseFromBaiinfoIndex) GetItemsByCondition(condition string, pars []inte
 
 // BaseFromSciIndex 卓创数据（红桃3）
 type BaseFromSciIndex struct {
-	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey"`
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id;primaryKey"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -1044,7 +1044,7 @@ func (m *BaseFromSciIndex) GetItemsByCondition(condition string, pars []interfac
 
 // BaseFromCoalmineMapping 中国煤炭市场网
 type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk" gorm:"primaryKey"`
+	BaseFromCoalmineMappingId int       `gorm:"column:base_from_coalmine_mapping_id;primaryKey"`
 	ClassifyId                int       `description:"分类ID"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称"`
@@ -1117,7 +1117,7 @@ func (m *BaseFromCoalmineMapping) GetItemsByCondition(condition string, pars []i
 
 // BaseFromEiaSteoIndex EIA STEO报告
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey"`
+	BaseFromEiaSteoIndexId    int       `gorm:"column:base_from_eia_steo_index_id;primaryKey"`
 	BaseFromEiaSteoClassifyId int       `description:"分类ID"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称"`
@@ -1190,7 +1190,7 @@ func (m *BaseFromEiaSteoIndex) GetItemsByCondition(condition string, pars []inte
 
 // BaseFromIcpiIndex ICPI消费价格指数
 //type BaseFromIcpiIndex struct {
-//	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk" gorm:"primaryKey"`
+//	BaseFromIcpiIndexId    int       `gorm:"column:base_from_icpi_index_id;primaryKey"`
 //	BaseFromIcpiClassifyId int       `description:"分类ID"`
 //	IndexCode              string    `description:"指标编码"`
 //	IndexName              string    `description:"指标名称"`
@@ -1263,7 +1263,7 @@ func (m *BaseFromIcpiIndex) GetItemsByCondition(condition string, pars []interfa
 
 // BaseFromYongyiIndex 涌益咨询
 type BaseFromYongyiIndex struct {
-	YongyiIndexId int       `orm:"column(yongyi_index_id);pk" gorm:"primaryKey"`
+	YongyiIndexId int       `gorm:"column:yongyi_index_id;primaryKey"`
 	ClassifyId    int       `description:"分类ID"`
 	IndexCode     string    `description:"指标编码"`
 	IndexName     string    `description:"指标名称"`
@@ -1336,7 +1336,7 @@ func (m *BaseFromYongyiIndex) GetItemsByCondition(condition string, pars []inter
 
 // BaseFromFenweiIndex 汾渭数据
 type BaseFromFenweiIndex struct {
-	FenweiIndexId int       `orm:"column(fenwei_index_id);pk" gorm:"primaryKey"`
+	FenweiIndexId int       `gorm:"column:fenwei_index_id;primaryKey"`
 	ClassifyId    int       `description:"分类ID"`
 	IndexCode     string    `description:"指标编码"`
 	IndexName     string    `description:"指标名称"`
@@ -1409,7 +1409,7 @@ func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []inter
 
 // BaseFromSci99Index 卓创资讯
 //type BaseFromSci99Index struct {
-//	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey"`
+//	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id;primaryKey"`
 //	ClassifyId         int       `description:"分类ID"`
 //	IndexCode          string    `description:"指标编码"`
 //	IndexName          string    `description:"指标名称"`
@@ -1482,16 +1482,16 @@ func (m *BaseFromSci99Index) GetItemsByCondition(condition string, pars []interf
 
 // BaseFromGlIndex 钢联原始指标库
 type BaseFromGlIndex struct {
-	PrimaryId   int       `orm:"column(ID);pk" gorm:"primaryKey"`
-	IndexCode   string    `orm:"column(INDEX_CODE)" description:"指标编码"`
-	IndexName   string    `orm:"column(INDEX_NAME)" description:"指标名称"`
-	Unit        string    `orm:"column(UNIT_NAME)" description:"单位"`
-	Frequency   string    `orm:"column(FREQUENCY_NAME)" description:"频度"`
-	StartDate   time.Time `orm:"column(BEGIN_DATE)" description:"开始日期"`
-	EndDate     time.Time `orm:"column(END_DATE)" description:"结束日期"`
-	LatestValue float64   `orm:"column(DATA_VALUE)" description:"最新值"`
-	CreateTime  time.Time `orm:"column(CREATE_TIME)" description:"创建时间"`
-	ModifyTime  time.Time `orm:"column(UPDATE_TIME)" description:"更新时间"`
+	PrimaryId   int       `gorm:"column:ID;primaryKey"`
+	IndexCode   string    `gorm:"column:INDEX_CODE" description:"指标编码"`
+	IndexName   string    `gorm:"column:INDEX_NAME" description:"指标名称"`
+	Unit        string    `gorm:"column:UNIT_NAME" description:"单位"`
+	Frequency   string    `gorm:"column:FREQUENCY_NAME" description:"频度"`
+	StartDate   string    `gorm:"column:BEGIN_DATE" description:"开始日期"`
+	EndDate     string    `gorm:"column:END_DATE" description:"结束日期"`
+	LatestValue float64   `gorm:"column:DATA_VALUE" description:"最新值"`
+	CreateTime  time.Time `gorm:"column:CREATE_TIME" description:"创建时间"`
+	ModifyTime  time.Time `gorm:"column:UPDATE_TIME" description:"更新时间"`
 }
 
 func (m *BaseFromGlIndex) SourceInfo() (int, int, string) {
@@ -1526,8 +1526,8 @@ func (m *BaseFromGlIndex) Format2SearchDataSource(origin *BaseFromGlIndex) (item
 	//item.ClassifyId = origin.ClassifyId
 	item.Unit = origin.Unit
 	item.Frequency = origin.Frequency
-	item.StartDate = utils.TimeTransferString(utils.FormatDate, origin.StartDate)
-	item.EndDate = utils.TimeTransferString(utils.FormatDate, origin.EndDate)
+	item.StartDate = origin.StartDate
+	item.EndDate = origin.EndDate
 	item.LatestValue = fmt.Sprint(origin.LatestValue)
 	item.Source = source
 	item.SubSource = subSource
@@ -1554,17 +1554,17 @@ func (m *BaseFromGlIndex) GetItemsByCondition(condition string, pars []interface
 
 // BaseFromManualEdb 手工数据录入
 type BaseFromManualEdb struct {
-	//PrimaryId   int       `orm:"column(TRADE_CODE)"` // 注手工指标没自增ID...
-	IndexCode   string    `orm:"column(TRADE_CODE)" description:"指标编码"`
-	IndexName   string    `orm:"column(SEC_NAME)" description:"指标名称"`
-	ClassifyId  int       `orm:"column(classify_id)" description:"分类ID"`
-	Unit        string    `orm:"column(UNIT)" description:"单位"`
-	Frequency   string    `orm:"column(frequency)" description:"频度"`
-	StartDate   time.Time `orm:"column(start_date)" description:"开始日期"`
-	EndDate     time.Time `orm:"column(end_date)" description:"结束日期"`
-	LatestValue float64   `orm:"column(latest_value)" description:"最新值"`
-	CreateTime  time.Time `orm:"column(create_date)" description:"创建时间"`
-	ModifyTime  time.Time `orm:"column(modify_time)" description:"更新时间"`
+	//PrimaryId   int       `gorm:"column:TRADE_CODE)"` // 注手工指标没自增ID...
+	IndexCode   string    `gorm:"column:TRADE_CODE" description:"指标编码"`
+	IndexName   string    `gorm:"column:SEC_NAME" description:"指标名称"`
+	ClassifyId  int       `gorm:"column:classify_id" description:"分类ID"`
+	Unit        string    `gorm:"column:UNIT" description:"单位"`
+	Frequency   string    `gorm:"column:frequency" description:"频度"`
+	StartDate   time.Time `gorm:"column:start_date" description:"开始日期"`
+	EndDate     time.Time `gorm:"column:end_date" description:"结束日期"`
+	LatestValue float64   `gorm:"column:latest_value" description:"最新值"`
+	CreateTime  time.Time `gorm:"column:create_date" description:"创建时间"`
+	ModifyTime  time.Time `gorm:"column:modify_time" description:"更新时间"`
 }
 
 func (m *BaseFromManualEdb) SourceInfo() (int, int, string) {
@@ -1627,7 +1627,7 @@ func (m *BaseFromManualEdb) GetItemsByCondition(condition string, pars []interfa
 
 // BaseFromBusinessIndex 自有数据
 type BaseFromBusinessIndex struct {
-	BaseFromBusinessIndexId int `orm:"column(base_from_business_index_id);pk" gorm:"primaryKey"`
+	BaseFromBusinessIndexId int `gorm:"column:base_from_business_index_id;primaryKey"`
 	//ClassifyId              int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -1700,7 +1700,7 @@ func (m *BaseFromBusinessIndex) GetItemsByCondition(condition string, pars []int
 
 // BaseFromBloombergIndex Bloomberg
 type BaseFromBloombergIndex struct {
-	BaseFromBloombergIndexId int `orm:"column(base_from_bloomberg_index_id);pk" gorm:"primaryKey"`
+	BaseFromBloombergIndexId int `gorm:"column:base_from_bloomberg_index_id;primaryKey"`
 	//ClassifyId              int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -1773,7 +1773,7 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 
 // BaseFromMtjhMapping 煤炭江湖
 type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey"`
+	BaseFromMtjhMappingId int `gorm:"column:base_from_mtjh_mapping_id;primaryKey"`
 	//ClassifyId            int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -2012,7 +2012,7 @@ func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *Base
 
 // BaseFromMtjhIndex 煤炭江湖数据表
 type BaseFromMtjhIndex struct {
-	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk" gorm:"primaryKey"`
+	BaseFromMtjhIndexId int       `gorm:"column:base_from_mtjh_index_id;primaryKey"`
 	IndexCode           string    `description:"指标编码"`
 	IndexName           string    `description:"指标名称"`
 	DealValue           float64   `description:"成交量"`