查询修改

models/base_from_baiinfo.go

@@ -42,7 +42,7 @@ func GetBaseFromBaiinfoDataByCondition(condition string, pars []interface{}) (li
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/base_from_bloomberg.go

@@ -114,7 +114,7 @@ func GetBaseFromBloombergDataByCondition(condition string, pars []interface{}) (
 	}
 	sql := `SELECT * FROM (` + sub + ` HAVING 1 ORDER BY modify_time DESC) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -214,7 +214,7 @@ func GetBloombergDataByCondition(condition string, pars []interface{}) (item []*
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_business_data.go

@@ -80,7 +80,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 	}
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
 }
@@ -110,7 +110,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
 }
@@ -141,7 +141,7 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
 }
@@ -162,7 +162,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&count).Error
 
 	return
 }
@@ -313,7 +313,7 @@ func (m *BaseFromBusinessData) DelDataByCond(condition []string, pars []interfac
 	sql += ` WHERE ` + strings.Join(condition, " AND ")
 
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 
 	return
 }

models/base_from_ccf.go

@@ -45,7 +45,7 @@ func GetBaseFromCCFDataByCondition(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -290,7 +290,7 @@ func (m *BaseFromCCFIndex) GetItemsByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_index WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -385,6 +385,7 @@ type BaseFromCCFClassify struct {
 	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
 	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
 }
+
 func (m *BaseFromCCFClassify) Add() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(m)
@@ -420,7 +421,7 @@ func (m *BaseFromCCFClassify) GetItemsByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_classify WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_cffex.go

@@ -104,7 +104,7 @@ func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*Base
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_coal.go

@@ -63,7 +63,7 @@ func GetCoalDataByTradeCode(suffix, condition string, pars []interface{}) (item
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_com_trade.go

@@ -64,7 +64,7 @@ func GetComTradeDataByTradeCode(tradeCode, startDate string) (items []*ComTradeD
 	}
 	sql := `select trade_value AS value,data_time from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -78,7 +78,7 @@ func GetComTradeDataByWeightCode(weightCode, startDate string) (items []*ComTrad
 	}
 	sql := `select net_weight_value AS value,data_time from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_dl.go

@@ -89,7 +89,7 @@ func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_edb_mapping.go

@@ -122,7 +122,7 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 
@@ -142,7 +142,7 @@ func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interfa
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -150,7 +150,7 @@ func (m *BaseFromEdbMapping) GetCountByCondition(condition string, pars []interf
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&count).Error
 	return
 }
 
@@ -166,7 +166,7 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_eia_steo.go

@@ -32,7 +32,7 @@ func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*Ei
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_fenwei.go

@@ -47,7 +47,7 @@ func GetBaseFromFenweiDataByCondition(condition string, pars []interface{}) (lis
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -294,7 +294,7 @@ func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_index WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -435,8 +435,8 @@ func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_classify WHERE 1=1 %s %s`, fields, condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	//_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_gie.go

@@ -139,7 +139,6 @@ type BaseFromTradeEicIndexV2 struct {
 	ModifyTime             time.Time `gorm:"column:modify_time"`
 }
 
-
 func (m *BaseFromTradeEicIndexV2) TableName() string {
 	return "base_from_eic_index"
 }
@@ -186,7 +185,7 @@ func GetGieDataByTradeCode(condition string, pars []interface{}) (item []*BaseFr
 	sql += ` ORDER BY gas_day_started_on DESC `
 	fmt.Println(sql, pars)
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -199,7 +198,7 @@ func GetGieDataByTradeCodeV2(condition string, pars []interface{}) (item []*Base
 	sql += ` ORDER BY gas_day_start DESC `
 	fmt.Println(sql, pars)
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_google_travel.go

@@ -63,7 +63,7 @@ func GetBaseFromChangesVisitorsCovidDataByTradeCode(condition string, pars []int
 	}
 	sql += ` ORDER BY day DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_gz.go

@@ -81,7 +81,7 @@ func GetBaseFromGuangzhouDataDataByCondition(condition string, pars []interface{
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_icpi.go

@@ -70,7 +70,7 @@ func GetBaseFromIcpiDataDataByCondition(condition string, pars []interface{}) (i
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_mtjh.go

@@ -9,17 +9,17 @@ import (
 	"time"
 )
 
-//type BaseFromMtjhMapping struct {
-//	BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
-//	IndexName             string    `description:"持买单量指标名称"`
-//	IndexCode             string    `description:"持买单量指标编码"`
-//	CreateTime            time.Time `description:"时间"`
-//	Area                  string    `description:"区域"`
-//	Port                  string    `description:"港口或码头"`
-//	Variety               string    `description:"品种"`
-//	Unit                  string    `description:"单位"`
-//	Frequency             string    `description:"频率"`
-//}
+//	type BaseFromMtjhMapping struct {
+//		BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
+//		IndexName             string    `description:"持买单量指标名称"`
+//		IndexCode             string    `description:"持买单量指标编码"`
+//		CreateTime            time.Time `description:"时间"`
+//		Area                  string    `description:"区域"`
+//		Port                  string    `description:"港口或码头"`
+//		Variety               string    `description:"品种"`
+//		Unit                  string    `description:"单位"`
+//		Frequency             string    `description:"频率"`
+//	}
 type BaseFromMtjhMapping struct {
 	BaseFromMtjhMappingId int       `gorm:"column:base_from_mtjh_mapping_id;primaryKey" description:"持买单量指标ID"`
 	IndexName             string    `gorm:"column:index_name" description:"持买单量指标名称"`
@@ -325,6 +325,6 @@ func GetMtjhDataByTradeCode(condition string, pars []interface{}) (item []*BaseF
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }

models/base_from_mysteel_chemical.go

@@ -33,7 +33,7 @@ func GetMysteelChemicalDataByCondition(condition string, pars []interface{}) (it
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -267,6 +267,7 @@ type BaseFromMysteelChemicalIndex struct {
 	TerminalCode                      string    `gorm:"column:terminal_code" description:"终端编码"`
 	IsSupplierStop                    int       `gorm:"column:is_supplier_stop" description:"是否供应商停更:1:停更,0:未停更"`
 }
+
 // tableName
 func (m *BaseFromMysteelChemicalIndex) TableName() string {
 	return "base_from_mysteel_chemical_index"
@@ -492,23 +493,24 @@ type HandleMysteelIndexResp struct {
 }
 
 // 钢联化工指标数据
-//type BaseFromMysteelChemicalData struct {
-//	BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
-//	BaseFromMysteelChemicalIndexId int64
-//	IndexCode                      string
-//	DataTime                       time.Time
-//	Value                          string
-//	UpdateDate                     string
-//	CreateTime                     time.Time `description:"创建时间"`
-//	ModifyTime                     time.Time `description:"修改时间"`
-//}
+//
+//	type BaseFromMysteelChemicalData struct {
+//		BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
+//		BaseFromMysteelChemicalIndexId int64
+//		IndexCode                      string
+//		DataTime                       time.Time
+//		Value                          string
+//		UpdateDate                     string
+//		CreateTime                     time.Time `description:"创建时间"`
+//		ModifyTime                     time.Time `description:"修改时间"`
+//	}
 type BaseFromMysteelChemicalData struct {
-	BaseFromMysteelChemicalDataId  int64 `gorm:"column:base_from_mysteel_chemical_data_id;primaryKey" description:"数据ID"`
-	BaseFromMysteelChemicalIndexId int64 `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
-	IndexCode                      string `gorm:"column:index_code" description:"指标编码"`
+	BaseFromMysteelChemicalDataId  int64     `gorm:"column:base_from_mysteel_chemical_data_id;primaryKey" description:"数据ID"`
+	BaseFromMysteelChemicalIndexId int64     `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
+	IndexCode                      string    `gorm:"column:index_code" description:"指标编码"`
 	DataTime                       time.Time `gorm:"column:data_time" description:"数据时间"`
-	Value                          string `gorm:"column:value" description:"数据值"`
-	UpdateDate                     string `gorm:"column:update_date" description:"更新日期"`
+	Value                          string    `gorm:"column:value" description:"数据值"`
+	UpdateDate                     string    `gorm:"column:update_date" description:"更新日期"`
 	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
 	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
@@ -574,7 +576,7 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexCountByFrequency(condition string
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&total)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&total).Error
 
 	return
 }
@@ -648,23 +650,23 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexByCondition(condition string, par
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
-//type BaseFromMysteelChemicalRecord struct {
-//	BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
-//	BaseFromMysteelChemicalIndexId  int64
-//	OldIndexName                    string    `description:"原始名称"`
-//	NewIndexName                    string    `description:"新的名称"`
-//	CreateTime                      time.Time `description:"记录创建时间"`
-//	Timestamp                       int64     `description:"记录创建时间戳"`
-//}
+//	type BaseFromMysteelChemicalRecord struct {
+//		BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
+//		BaseFromMysteelChemicalIndexId  int64
+//		OldIndexName                    string    `description:"原始名称"`
+//		NewIndexName                    string    `description:"新的名称"`
+//		CreateTime                      time.Time `description:"记录创建时间"`
+//		Timestamp                       int64     `description:"记录创建时间戳"`
+//	}
 type BaseFromMysteelChemicalRecord struct {
-	BaseFromMysteelChemicalRecordId int64 `gorm:"column:base_from_mysteel_chemical_record_id;primaryKey" description:"记录ID"`
-	BaseFromMysteelChemicalIndexId  int64 `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
-	OldIndexName                    string `gorm:"column:old_index_name" description:"原始名称"`
-	NewIndexName                    string `gorm:"column:new_index_name" description:"新的名称"`
+	BaseFromMysteelChemicalRecordId int64     `gorm:"column:base_from_mysteel_chemical_record_id;primaryKey" description:"记录ID"`
+	BaseFromMysteelChemicalIndexId  int64     `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
+	OldIndexName                    string    `gorm:"column:old_index_name" description:"原始名称"`
+	NewIndexName                    string    `gorm:"column:new_index_name" description:"新的名称"`
 	CreateTime                      time.Time `gorm:"column:create_time" description:"记录创建时间"`
 	Timestamp                       int64     `gorm:"column:timestamp" description:"记录创建时间戳"`
 }

models/base_from_national_statistics.go

@@ -22,11 +22,11 @@ import (
 
 // BaseFromNationalStatisticsData 国家统计局-指标数据表
 type BaseFromNationalStatisticsData struct {
-	BaseFromNationalStatisticsDataId  int `gorm:"column:base_from_national_statistics_data_id;primaryKey"`
-	BaseFromNationalStatisticsIndexId int `gorm:"column:base_from_national_statistics_index_id"`
-	IndexCode                         string `gorm:"column:index_code"`
-	DataTime                          string `gorm:"column:data_time"`
-	Value                             string `gorm:"column:value"`
+	BaseFromNationalStatisticsDataId  int       `gorm:"column:base_from_national_statistics_data_id;primaryKey"`
+	BaseFromNationalStatisticsIndexId int       `gorm:"column:base_from_national_statistics_index_id"`
+	IndexCode                         string    `gorm:"column:index_code"`
+	DataTime                          string    `gorm:"column:data_time"`
+	Value                             string    `gorm:"column:value"`
 	CreateTime                        time.Time `gorm:"column:create_time"`
 	ModifyTime                        time.Time `gorm:"column:modify_time"`
 }
@@ -43,7 +43,7 @@ func GetBaseFromNationalStatisticsDataByCondition(condition string, pars []inter
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 

models/base_from_oilchem.go

@@ -9,35 +9,35 @@ import (
 	"time"
 )
 
-//type BaseFromOilchemIndex struct {
-//	BaseFromOilchemIndexId int       // 主键ID
-//	IndexCode              string    // 指标编码
-//	IndexName              string    // 指标名称
-//	ClassifyId             uint      // 分类ID
-//	Unit                   string    // 单位
-//	Frequency              string    // 频度
-//	Describe               string    // 指标描述
-//	Sort                   int       // 排序
-//	CreateTime             time.Time // 创建时间
-//	ModifyTime             time.Time // 修改时间
-//}
+//	type BaseFromOilchemIndex struct {
+//		BaseFromOilchemIndexId int       // 主键ID
+//		IndexCode              string    // 指标编码
+//		IndexName              string    // 指标名称
+//		ClassifyId             uint      // 分类ID
+//		Unit                   string    // 单位
+//		Frequency              string    // 频度
+//		Describe               string    // 指标描述
+//		Sort                   int       // 排序
+//		CreateTime             time.Time // 创建时间
+//		ModifyTime             time.Time // 修改时间
+//	}
 type BaseFromOilchemIndex struct {
 	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id;primaryKey"` // 主键ID
-	IndexCode              string    `gorm:"column:index_code"`                           // 指标编码
-	IndexName              string    `gorm:"column:index_name"`                           // 指标名称
-	ClassifyId             uint      `gorm:"column:classify_id"`                          // 分类ID
-	Unit                   string    `gorm:"column:unit"`                                 // 单位
-	Frequency              string    `gorm:"column:frequency"`                            // 频度
-	Describe               string    `gorm:"column:describe"`                             // 指标描述
+	IndexCode              string    `gorm:"column:index_code"`                            // 指标编码
+	IndexName              string    `gorm:"column:index_name"`                            // 指标名称
+	ClassifyId             uint      `gorm:"column:classify_id"`                           // 分类ID
+	Unit                   string    `gorm:"column:unit"`                                  // 单位
+	Frequency              string    `gorm:"column:frequency"`                             // 频度
+	Describe               string    `gorm:"column:describe"`                              // 指标描述
 	Sort                   int       `gorm:"column:sort"`                                  // 排序
 	CreateTime             time.Time `gorm:"column:create_time"`                           // 创建时间
 	ModifyTime             time.Time `gorm:"column:modify_time"`                           // 修改时间
 }
 
-
 func (m *BaseFromOilchemIndex) TableName() string {
 	return "base_from_oilchem_index"
 }
+
 //
 //type BaseFromOilchemData struct {
 //	BaseFromOilchemDataId  int    // 数据表ID
@@ -51,13 +51,14 @@ func (m *BaseFromOilchemIndex) TableName() string {
 
 type BaseFromOilchemData struct {
 	BaseFromOilchemDataId  int       `gorm:"column:base_from_oilchem_data_id;primaryKey"` // 数据表ID
-	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id"`          // 指标ID
+	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id"`           // 指标ID
 	IndexCode              string    `gorm:"column:index_code"`                           // 指标编码
-	DataTime               string    `gorm:"column:data_time"`                             // 数据时间
-	Value                  string    `gorm:"column:value"`                                 // 数据值
-	CreateTime             time.Time `gorm:"column:create_time"`                           // 创建时间
-	ModifyTime             time.Time `gorm:"column:modify_time"`                           // 修改时间
+	DataTime               string    `gorm:"column:data_time"`                            // 数据时间
+	Value                  string    `gorm:"column:value"`                                // 数据值
+	CreateTime             time.Time `gorm:"column:create_time"`                          // 创建时间
+	ModifyTime             time.Time `gorm:"column:modify_time"`                          // 修改时间
 }
+
 func (m *BaseFromOilchemData) TableName() string {
 	return "base_from_oilchem_data"
 }
@@ -262,7 +263,7 @@ func GetBaseFromOilchemDataByCondition(condition string, pars []interface{}) (li
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 

models/base_from_sci.go

@@ -69,7 +69,7 @@ func GetBaseFromSciDataByCondition(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 

models/base_from_sh.go

@@ -34,12 +34,13 @@ type BaseFromTradeShIndex struct {
 	ModifyTime             time.Time
 	DataTime               string
 }
+
 func (m *BaseFromTradeShIndex) TableName() string {
 	return "base_from_trade_shanghai_index"
 }
 
 type BaseFromShDataSimple struct {
-	Id        int    `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
+	Id        int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -48,6 +49,7 @@ type BaseFromShDataSimple struct {
 	BuyValue  string
 	SoldValue string
 }
+
 func (m *BaseFromShDataSimple) TableName() string {
 	return "base_from_trade_shanghai_index"
 }
@@ -69,7 +71,7 @@ func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -312,7 +314,7 @@ type SHMessage struct {
 }
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShanghaiIndexId int    `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
+	BaseFromTradeShanghaiIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	Rank                         int
 	DealShortName                string
 	DealName                     string
@@ -336,6 +338,7 @@ type BaseFromTradeShanghaiIndex struct {
 	ModifyTime                   time.Time
 	DataTime                     string
 }
+
 func (m *BaseFromTradeShanghaiIndex) TableName() string {
 	return "base_from_trade_shanghai_index"
 }

models/base_from_shfe.go

@@ -34,6 +34,7 @@ type BaseFromTradeShfeIndex struct {
 	ModifyTime               time.Time
 	DataTime                 string
 }
+
 func (m *BaseFromTradeShfeIndex) TableName() string {
 	return "base_from_trade_ine_index"
 }
@@ -57,6 +58,7 @@ type BaseFromShfeDataSimple struct {
 	BuyValue  string
 	SoldValue string
 }
+
 func (m *BaseFromShfeDataSimple) TableName() string {
 	return "base_from_trade_ine_index"
 }
@@ -69,7 +71,7 @@ func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseF
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -298,6 +300,7 @@ type BaseFromTradeIneIndex struct {
 	ModifyTime              time.Time
 	DataTime                string
 }
+
 func (m *BaseFromTradeIneIndex) TableName() string {
 	return "base_from_trade_ine_index"
 }
@@ -308,6 +311,7 @@ type BaseFromTradeMapping struct {
 	IndexCode              string
 	Exchange               string
 }
+
 func (m *BaseFromTradeMapping) TableName() string {
 	return "base_from_trade_mapping"
 }

models/base_from_smm.go

@@ -19,6 +19,7 @@ type BaseFromSmmData struct {
 	ModifyTime         time.Time
 	DataTimestamp      int64
 }
+
 func (m *BaseFromSmmData) TableName() string {
 	return "base_from_smm_data"
 }
@@ -44,7 +45,7 @@ func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 
@@ -256,6 +257,7 @@ type BaseFromSmmIndex struct {
 	DataState          string
 	ReleaseTime        string
 }
+
 func (d *BaseFromSmmIndex) TableName() string {
 	return "base_from_smm_index"
 }

models/base_from_stock_plant.go

@@ -24,6 +24,7 @@ type StockPlantEdbdata struct {
 	Value        string    `gorm:"column:value" description:"值"`
 	ModifyTime   time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
+
 func (m *StockPlantEdbdata) TableName() string {
 	return "base_from_stock_plant_data"
 }
@@ -36,7 +37,7 @@ func GetStockPlantEdbDataByCondition(condition string, pars []interface{}) (item
 	sql += ` ORDER BY data_time DESC `
 	//o := orm.NewOrm()
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/base_from_ths_hf.go

@@ -169,7 +169,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -177,7 +177,7 @@ func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interf
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&count).Error
 	return
 }
 
@@ -193,7 +193,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_ths_hf_data.go

@@ -125,7 +125,7 @@ func (m *BaseFromThsHfData) GetItemByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *BaseFromThsHfData) GetCountByCondition(condition string, pars []interfa
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&count).Error
 	return
 }
 
@@ -149,7 +149,7 @@ func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interfa
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_yongyi.go

@@ -22,6 +22,7 @@ type BaseFromYongyiData struct {
 	ModifyTime    time.Time
 	DataTimestamp int64
 }
+
 // tablename
 func (m *BaseFromYongyiData) TableName() string {
 	return "base_from_yongyi_data"
@@ -34,7 +35,7 @@ func GetBaseFromYongyiDataByCondition(condition string, pars []interface{}) (lis
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -216,6 +217,7 @@ type BaseFromYongyiIndex struct {
 	CreateTime    time.Time
 	ModifyTime    time.Time
 }
+
 func (y *BaseFromYongyiIndex) TableName() string {
 	return "base_from_yongyi_index"
 }
@@ -327,6 +329,7 @@ type BaseFromYongyiClassify struct {
 	ModifyTime      time.Time `description:"修改时间"`
 	CreateTime      time.Time `description:"创建时间"`
 }
+
 func (y *BaseFromYongyiClassify) TableName() string {
 	return "base_from_yongyi_classify"
 }

models/base_from_zz.go

@@ -36,7 +36,7 @@ import (
 //}
 
 type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int       `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
+	BaseFromTradeZhengzhouIndexId int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
 	Rank                          int
 	DealShortName                 string    `gorm:"column:deal_short_name"`
 	DealName                      string    `gorm:"column:deal_name"`
@@ -108,7 +108,7 @@ func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/ccf_stock_excel.go

@@ -97,14 +97,14 @@ func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -119,7 +119,7 @@ func (m *CCFStockExcel) GetItemsByCondition(condition string, pars []interface{}
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/data_stat/edb_info_update_log.go

@@ -52,7 +52,7 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}) (item []*E
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 

models/data_stat/edb_info_update_stat.go

@@ -98,6 +98,6 @@ func GetEdbUpdateStatByCondition(condition string, pars []interface{}) (item []*
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -30,7 +30,7 @@ func GetEdbSourceStatByCondition(condition string, pars []interface{}) (item []*
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 

models/edb_data_base.go

@@ -57,7 +57,7 @@ func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -73,7 +73,7 @@ func GetEdbDataAllByEdbCode(edbCode string, source, subSource, limit int) (items
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
@@ -86,7 +86,7 @@ func GetEdbDataByCondition(source, subSource int, condition string, pars []inter
 	}
 	sql += ` ORDER BY data_time DESC `
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/edb_data_ths_hf.go

@@ -111,14 +111,14 @@ func (m *EdbDataThsHf) GetItemByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *EdbDataThsHf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *EdbDataThsHf) GetItemsByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/edb_data_trade_analysis.go

@@ -111,14 +111,14 @@ func (m *EdbDataTradeAnalysis) GetItemByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *EdbDataTradeAnalysis) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *EdbDataTradeAnalysis) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/edb_info.go

@@ -284,7 +284,7 @@ func GetEdbDataListAllByMysql(source, subSource int, findEdbDataListAllCond Find
 		sql += ` ORDER BY data_time DESC `
 	}
 	// todo
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -551,7 +551,7 @@ func GetLastEdbData(condition string, pars []interface{}, source, subSource int)
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -583,7 +583,7 @@ func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
@@ -594,7 +594,7 @@ func GetEdbInfoCalculateCountByCondition(condition string, pars []interface{}) (
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -621,7 +621,7 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -656,7 +656,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	} else {
 		sql += ` ORDER BY edb_info_id ASC `
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -1267,7 +1267,7 @@ func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbI
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/edb_refresh/edb_refresh_config.go

@@ -78,7 +78,7 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_default_config.go

@@ -100,7 +100,7 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_mapping.go

@@ -108,7 +108,7 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/factor_edb_series.go

@@ -105,14 +105,14 @@ func (m *FactorEdbSeries) GetItemByCondition(condition string, pars []interface{
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -127,7 +127,7 @@ func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_calculate_data.go

@@ -117,14 +117,14 @@ func (m *FactorEdbSeriesCalculateData) GetItemByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -139,7 +139,7 @@ func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_calculate_data_qjjs.go

@@ -113,14 +113,14 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
@@ -201,6 +201,6 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoI
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, m.TableName())
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }

models/factor_edb_series_calculate_func.go

@@ -94,14 +94,14 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -116,7 +116,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_chart_mapping.go

@@ -113,14 +113,14 @@ func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_mapping.go

@@ -103,14 +103,14 @@ func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -125,7 +125,7 @@ func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/future_good/chart_info_future_good_profit.go

@@ -67,7 +67,7 @@ func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
 func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -82,6 +82,6 @@ func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }

models/future_good/future_good_edb_data.go

@@ -79,7 +79,7 @@ func GetFutureGoodEdbDataList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += `ORDER BY data_time asc `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 

models/future_good/future_good_edb_info.go

@@ -56,7 +56,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += `ORDER BY future_good_edb_info_id DESC `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 

models/trade_analysis/trade_futures_company.go

@@ -72,14 +72,14 @@ func (m *TradeFuturesCompany) GetItemByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *TradeFuturesCompany) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -94,7 +94,7 @@ func (m *TradeFuturesCompany) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }