pars...

models/base_from_mysteel.go

@@ -11,14 +11,15 @@ import (
 
 //钢联
 
-//type GlData struct {
-//	InputValue float64 `orm:"column(DATA_VALUE)" description:"日期"`
-//	DataTime   string  `orm:"column(DATA_DATE)" description:"值"`
-//}
+//	type GlData struct {
+//		InputValue float64 `orm:"column(DATA_VALUE)" description:"日期"`
+//		DataTime   string  `orm:"column(DATA_DATE)" description:"值"`
+//	}
 type GlData struct {
 	InputValue float64 `gorm:"column:DATA_VALUE" description:"值"`
 	DataTime   string  `gorm:"column:DATA_DATE" description:"日期"`
 }
+
 // tableName
 func (m *GlData) TableName() string {
 	return "mb_index_main_data"
@@ -46,7 +47,7 @@ func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData,
 	//
 	//		order by PUBLISH_TIME DESC
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DmSQL["gl"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["gl"].Raw(sql, pars...).Scan(&item).Error
 	return
 }
 

models/business_conf.go

@@ -120,14 +120,14 @@ func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
 
 func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DmSQL["master"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["master"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *BusinessConf) 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.DmSQL["master"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["master"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -142,7 +142,7 @@ func (m *BusinessConf) 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.DmSQL["master"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["master"].Raw(sql, pars...).Scan(&items).Error
 	return
 }
 

models/edb_data_ths_hf.go

@@ -93,7 +93,7 @@ func (m *EdbDataThsHf) RemoveByCondition(condition string, pars []interface{}) (
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 

models/edb_data_trade_analysis.go

@@ -93,7 +93,7 @@ func (m *EdbDataTradeAnalysis) RemoveByCondition(condition string, pars []interf
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 

models/edb_info.go

@@ -351,7 +351,7 @@ func GetEdbDataListAllByMysqlTo(to *gorm.DB, source, subSource int, findEdbDataL
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	err = to.Raw(sql, pars).Scan(&item).Error
+	err = to.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
@@ -640,7 +640,7 @@ func GetEdbDataListAllV1ByTo(to *gorm.DB, condition string, pars []interface{},
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	err = to.Raw(sql, pars).Scan(&item).Error
+	err = to.Raw(sql, pars...).Scan(&item).Error
 	return
 }
 

models/edb_source.go

@@ -42,14 +42,14 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM edb_source WHERE 1=1 %s %s`, fields, condition, order)
-	err = global.DEFAULT_DmSQL.Model(&EdbSource{}).Raw(sql, pars).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
 // GetEdbSourceItemByCondition 获取指标来源
 func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *EdbSource, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
-	err = global.DEFAULT_DmSQL.Model(&EdbSource{}).Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/factor_edb_series.go

@@ -246,7 +246,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 	pars := make([]interface{}, 0)
 	pars = append(pars, item.FactorEdbSeriesId)
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, mappingOb.TableName(), cond)
-	e = to.Exec(sql, pars).Error
+	e = to.Exec(sql, pars...).Error
 	if e != nil {
 		err = fmt.Errorf("remove mapping err: %v", e)
 		return

models/factor_edb_series_calculate_data.go

@@ -99,7 +99,7 @@ func (m *FactorEdbSeriesCalculateData) RemoveByCondition(condition string, pars
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 

models/factor_edb_series_calculate_data_qjjs.go

@@ -95,7 +95,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) RemoveByCondition(condition string, p
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 

models/factor_edb_series_mapping.go

@@ -85,7 +85,7 @@ func (m *FactorEdbSeriesMapping) RemoveByCondition(condition string, pars []inte
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 

models/future_good/future_good_edb_data.go

@@ -163,7 +163,7 @@ func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate
 			sql += condition
 		}
 		sql += `ORDER BY data_time asc `
-		err = to.Raw(sql, pars).Scan(&existList).Error
+		err = to.Raw(sql, pars...).Scan(&existList).Error
 	}
 
 	existMap := make(map[string]*FutureGoodEdbData)
@@ -282,6 +282,7 @@ func GetAddSql(futureGoodEdbInfoId, futureGoodEdbCode, dataTime, tradeCode, open
 func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate string) (list []*FutureGoodEdbData, err error) {
 	var pars []interface{}
 	sql := `SELECT * FROM future_good_edb_data WHERE 1=1 AND future_good_edb_info_id = ? `
+	pars = append(pars, futureGoodEdbInfoId)
 	if startDate != "" {
 		sql += ` AND data_time>=? `
 		pars = append(pars, startDate)
@@ -293,6 +294,6 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 
 	sql += ` ORDER BY data_time ASC `
 
-	err = global.DEFAULT_DmSQL.Raw(sql, futureGoodEdbInfoId, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }

models/predict_edb_rule_data.go

@@ -34,6 +34,7 @@ func GetPredictEdbRuleDataItemList(edbInfoId, configId int, startDate, endDate s
 
 	var pars []interface{}
 	sql := ` SELECT * FROM predict_edb_rule_data WHERE edb_info_id = ? AND config_id = ? `
+	pars = append(pars, edbInfoId, configId)
 	if startDate != "" {
 		sql += ` AND data_time>=? `
 		pars = append(pars, startDate)
@@ -43,6 +44,6 @@ func GetPredictEdbRuleDataItemList(edbInfoId, configId int, startDate, endDate s
 		pars = append(pars, endDate)
 	}
 	sql += ` ORDER BY data_time ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId, configId, pars).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
 	return
 }

models/supply_analysis/variety.go

@@ -140,7 +140,7 @@ func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}
 	baseSql += ` GROUP BY a.variety_id ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -163,7 +163,7 @@ func (item Variety) GetListByPage(condition string, pars []interface{}, startSiz
 	baseSql += ` GROUP BY a.variety_id ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}