Merge branch 'dm' into feature/knowledge

controllers/report_author.go

@@ -117,7 +117,7 @@ func (this *ReportAuthorController) AddAuthor() {
 		br.ErrMsg = "获取数据异常，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.Id > 0 {
 		br.Msg = "已存在该作者"
 		br.ErrMsg = "已存在该作者"
 		br.IsSendEmail = false

global/dm.go

@@ -30,7 +30,7 @@ func InitDm() {
 		SlowThreshold:             200 * time.Millisecond, //慢sql ：200ms
 		LogLevel:                  logger.Info,            //记录的日志类型，info代表所有信息都记录
 		IgnoreRecordNotFoundError: true,                   //是否忽略找不到数据错误信息（只是日志记录记录成err还是普通的输出的区别，并不影响业务代码中的：找不到数据行error）
-		Colorful:                  true,                   //是否颜色输出
+		Colorful:                  false,                  //是否颜色输出
 	})
 
 	// 默认库

models/ai_summary/ai_summary.go

@@ -154,7 +154,7 @@ func GetAiSummaryListCountByCondition(condition string, pars []interface{}) (cou
 	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
 }
 

models/classify.go

@@ -191,29 +191,29 @@ func FindByIdClassify(classifyId int) (item *Classify, err error) {
 }
 
 type ClassifyList struct {
-	Id                    int             `gorm:"column:id" json:"id"`                                 //`orm:"column(id);pk" gorm:"primaryKey" `
-	ClassifyName          string          `gorm:"column:classify_name" json:"classify_name"`           //`description:"分类名称"`
-	Sort                  int             `gorm:"column:sort" json:"sort"`                             //`description:"排序"`
-	ParentId              int             `gorm:"column:parent_id" json:"parent_id"`                   //`description:"父级分类id"`
-	CreateTime            time.Time       `gorm:"column:create_time" json:"create_time"`               //`description:"创建时间"`
-	ModifyTime            time.Time       `gorm:"column:modify_time" json:"modify_time"`               //`description:"修改时间"`
-	Abstract              string          `gorm:"column:abstract" json:"abstract"`                     //`description:"简介"`
-	Descript              string          `gorm:"column:descript" json:"descript"`                     //`description:"描述"`
-	ClassifyLabel         string          `gorm:"column:classify_label" json:"classify_label"`         //`description:"分类标签"`
-	ShowType              int             `gorm:"column:show_type" json:"show_type"`                   //`description:"展示类型：1-列表 2-专栏"`
-	HasTeleconference     int             `gorm:"column:has_teleconference" json:"has_teleconference"` //`description:"是否有电话会：0-否 1-是"`
-	IsShow                int             `gorm:"column:is_show" json:"is_show"`                       //`description:"是否在小程序显示：1-显示 0-隐藏"`
-	YbFiccSort            int             `gorm:"column:yb_ficc_sort" json:"yb_ficc_sort"`             //`description:"小程序FICC页排序"`
-	YbFiccIcon            string          `gorm:"column:yb_ficc_icon" json:"yb_ficc_icon"`             // `description:"小程序FICC页icon"`
-	YbFiccPcIcon          string          `gorm:"column:yb_ficc_pc_icon" json:"yb_ficc_pc_icon"`       //`description:"小程序PC端FICC页背景图"`
-	YbIconUrl             string          `gorm:"column:yb_icon_url" json:"yb_icon_url"`               //`description:"小程序已购页icon"`
-	YbBgUrl               string          `gorm:"column:yb_bg_url" json:"yb_bg_url"`                   //`description:"小程序已购详情背景图"`
-	YbListImg             string          `gorm:"column:yb_list_img" json:"yb_list_img"`               //`description:"小程序研报列表封面图"`
-	YbShareBgImg          string          `gorm:"column:yb_share_bg_img" json:"yb_share_bg_img"`       //`description:"小程序研报详情分享背景图"`
-	YbRightBanner         string          `gorm:"column:yb_right_banner" json:"yb_right_banner"`       //`description:"Pc端详情页，右侧，报告合集背景图"`
-	RelateTel             int             `gorm:"column:relate_tel" json:"relate_tel"`                 //`description:"是否在电话会中可选: 0-否; 1-是"`
-	RelateVideo           int             `gorm:"column:relate_video" json:"relate_video"`             //`description:"是否在路演视频中可选: 0-否; 1-是"`
-	Enabled               int             `gorm:"column:enabled" json:"enabled"`                       //`description:"是否可用，1可用，0禁用"`
+	Id                    int             `gorm:"column:id"`                 //`orm:"column(id);pk" gorm:"primaryKey" `
+	ClassifyName          string          `gorm:"column:classify_name"`      //`description:"分类名称"`
+	Sort                  int             `gorm:"column:sort"`               //`description:"排序"`
+	ParentId              int             `gorm:"column:parent_id"`          //`description:"父级分类id"`
+	CreateTime            time.Time       `gorm:"column:create_time"`        //`description:"创建时间"`
+	ModifyTime            time.Time       `gorm:"column:modify_time"`        //`description:"修改时间"`
+	Abstract              string          `gorm:"column:abstract"`           //`description:"简介"`
+	Descript              string          `gorm:"column:descript"`           //`description:"描述"`
+	ClassifyLabel         string          `gorm:"column:classify_label"`     //`description:"分类标签"`
+	ShowType              int             `gorm:"column:show_type"`          //`description:"展示类型：1-列表 2-专栏"`
+	HasTeleconference     int             `gorm:"column:has_teleconference"` //`description:"是否有电话会：0-否 1-是"`
+	IsShow                int             `gorm:"column:is_show"`            //`description:"是否在小程序显示：1-显示 0-隐藏"`
+	YbFiccSort            int             `gorm:"column:yb_ficc_sort"`       //`description:"小程序FICC页排序"`
+	YbFiccIcon            string          `gorm:"column:yb_ficc_icon"`       // `description:"小程序FICC页icon"`
+	YbFiccPcIcon          string          `gorm:"column:yb_ficc_pc_icon"`    //`description:"小程序PC端FICC页背景图"`
+	YbIconUrl             string          `gorm:"column:yb_icon_url"`        //`description:"小程序已购页icon"`
+	YbBgUrl               string          `gorm:"column:yb_bg_url"`          //`description:"小程序已购详情背景图"`
+	YbListImg             string          `gorm:"column:yb_list_img"`        //`description:"小程序研报列表封面图"`
+	YbShareBgImg          string          `gorm:"column:yb_share_bg_img"`    //`description:"小程序研报详情分享背景图"`
+	YbRightBanner         string          `gorm:"column:yb_right_banner"`    //`description:"Pc端详情页，右侧，报告合集背景图"`
+	RelateTel             int             `gorm:"column:relate_tel"`         //`description:"是否在电话会中可选: 0-否; 1-是"`
+	RelateVideo           int             `gorm:"column:relate_video"`       //`description:"是否在路演视频中可选: 0-否; 1-是"`
+	Enabled               int             `gorm:"column:enabled"`            //`description:"是否可用，1可用，0禁用"`
 	Child                 []*ClassifyList `gorm:"-"`
 	ClassifyMenuId        int             `gorm:"-"` //`description:"二级分类-子目录ID"`
 	ClassifyMenuList      []*ClassifyMenu `gorm:"-"`
@@ -267,7 +267,7 @@ func GetClassifyList(keyWord string, enabled int) (items []*ClassifyList, err er
 
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -301,7 +301,7 @@ func GetClassifyListCount(keyWord, companyType string, hideDayWeek int) (count i
 	}
 	//o := orm.NewOrmUsingDB("rddp")
 	//err = o.Raw(sqlCount, pars...).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sqlCount, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sqlCount, pars...).Scan(&count).Error
 	return
 }
 
@@ -339,7 +339,7 @@ func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err erro
 	pars = append(pars, parentId)
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -365,7 +365,7 @@ func GetClassifyChildByParentIds(parentId []int, keyWord string, enabled int) (i
 	sql += ` ORDER BY create_time ASC `
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -426,7 +426,7 @@ func GetClassifyByCondition(condition, orderRule string, pars []interface{}) (it
 	sql += ` ORDER BY ` + order
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -568,7 +568,7 @@ func GetClassifyListByKeyword(keyWord string, enabled int) (items []*ClassifyLis
 
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/classify_menu.go

@@ -63,7 +63,7 @@ func GetClassifyMenuList(condition string, pars []interface{}) (list []*Classify
 	sql += condition
 	sql += ` ORDER BY sort ASC, create_time ASC`
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/classify_menu_relation.go

@@ -50,7 +50,7 @@ func GetClassifyMenuRelationList(condition string, pars []interface{}) (list []*
 	sql += condition
 	sql += ` ORDER BY create_time DESC`
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/cloud_disk_menu.go

@@ -55,7 +55,7 @@ func (m *CloudDiskMenu) GetItemByCondition(condition string, pars []interface{})
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -71,7 +71,7 @@ func (m *CloudDiskMenu) GetItemsByCondition(condition string, pars []interface{}
 	}
 	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/cloud_disk_resource.go

@@ -84,7 +84,7 @@ func (m *CloudDiskResource) GetItemByCondition(condition string, pars []interfac
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -100,7 +100,7 @@ func (m *CloudDiskResource) 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
 }
 
@@ -183,7 +183,9 @@ func GetCloudDiskMenuAndResourceList(menuCond, resourceCond string, menuPars, re
 	}
 	sql := fmt.Sprintf(base, menuCond, resourceCond, order)
 	//_, err = o.Raw(sql, menuPars, resourcePars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, menuPars, resourcePars).Find(&items).Error
+	pars := append(menuPars, resourcePars...)
+	//err = global.DEFAULT_DmSQL.Raw(sql, menuPars, resourcePars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/company/company_permission.go

@@ -131,7 +131,12 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
 	//_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
+	sql := ` SELECT chart_permission_id, chart_permission_name, permission_name, sort, enabled, created_time, last_updated_time, teleconference_sort, remark, classify_name, product_name, product_id, image_url, show_type, is_other, is_report, cygx_auth, permission_type, yb_img_url, product_permission_name, price_driven_state, image_url_m, parent_id, is_public 
+  	 FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? 
+
+	GROUP BY permission_name,
+	chart_permission_id, chart_permission_name, sort, enabled, created_time, last_updated_time, teleconference_sort, remark, classify_name, product_name, product_id, image_url, show_type, is_other, is_report, cygx_auth, permission_type, yb_img_url, product_permission_name, price_driven_state, image_url_m, parent_id, is_public
+	ORDER BY sort ASC `
 	err = global.DmSQL["rddp"].Raw(sql, productId, classifyName).Find(&items).Error
 	return
 }

models/data_manage/baiinfo_data.go

@@ -11,12 +11,12 @@ type BaiinfoClassify struct {
 	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
 }
 
-func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
-	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
+//func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
+//	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
+//	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+//
+//	return
+//}
 
 type BaiinfoFrequency struct {
 	Frequency string `description:"频度"`
@@ -49,13 +49,13 @@ type BaiinfoIndex struct {
 	ModifyTime             string
 }
 
-func GetBaiinfoIndex(condition string, pars interface{}) (items []*BaiinfoIndex, err error) {
+func GetBaiinfoIndex(condition string, pars []interface{}) (items []*BaiinfoIndex, err error) {
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_baiinfo_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_bloomberg_index.go

@@ -129,7 +129,7 @@ func (m *BaseFromBloombergIndex) 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 = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -137,7 +137,7 @@ func (m *BaseFromBloombergIndex) GetItemByCondition(condition string, pars []int
 func (m *BaseFromBloombergIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -156,7 +156,7 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 	if limit > 0 {
 		sql += fmt.Sprintf(` LIMIT %d`, limit)
 	}
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_business_data.go

@@ -75,7 +75,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition string, pars []interface
 		sql += ` ORDER BY ` + order
 	}
 
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -102,7 +102,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition string, pars []interfa
 
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
-	err = o.Raw(sql, pars).Scan(&result).Error
+	err = o.Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -130,7 +130,7 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -148,7 +148,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_business_index.go

@@ -110,7 +110,7 @@ func (m *BaseFromBusinessIndex) GetListCount(condition string, pars []interface{
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -210,12 +210,13 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 	}
 	sql += ` order by a.base_from_business_index_id desc `
 
+	pars = append(pars, utils.DATA_SOURCE_BUSINESS)
 	if limitSize > 0 {
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
 
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ccf.go

@@ -50,21 +50,13 @@ type CCFSingleData struct {
 	DataTime string `orm:"column(data_time)" description:"值"`
 }
 
-func GetCCFIndex(condition string, pars interface{}) (items []*BaseFromCCFIndexList, err error) {
+func GetCCFIndex(condition string, pars []interface{}) (items []*BaseFromCCFIndexList, err error) {
 	sql := ` SELECT * FROM base_from_ccf_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_ccf_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
-
-	return
-}
-
-func GetCCFIndexDataCount(indexCode string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(1) AS count FROM base_from_ccf_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ccf_classify.go

@@ -36,7 +36,7 @@ type BaseFromCCFClassifyItem struct {
 	Sort         int                        `description:"排序字段"`
 	CreateTime   string                     `description:"创建时间"`
 	ModifyTime   string                     `description:"修改时间"`
-	Child        []*BaseFromCCFClassifyItem `description:"子分类"`
+	Child        []*BaseFromCCFClassifyItem `gorm:"-" description:"子分类"`
 }
 
 func (y *BaseFromCCFClassify) Format2Item(origin *BaseFromCCFClassify) (item *BaseFromCCFClassifyItem) {

models/data_manage/base_from_edb_mapping.go

@@ -100,7 +100,7 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 		return
 	}
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Exec(sql, pars).Error
+	err = global.DmSQL["data"].Exec(sql, pars...).Error
 
 	return
 }
@@ -118,14 +118,14 @@ func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *BaseFromEdbMapping) 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["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -140,7 +140,7 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&items).Error
 
 	return
 }

models/data_manage/base_from_eia_stero.go

@@ -108,7 +108,7 @@ func GetEiaSteoIndexList(condition string, pars []interface{}) (items []*BaseFro
 	sql := ` SELECT *  FROM base_from_eia_steo_index WHERE 1=1  `
 	sql += condition
 	sql += ` ORDER BY base_from_eia_steo_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_fenwei.go

@@ -91,13 +91,13 @@ type BaseFromFenWeiIndexPage struct {
 	Paging *paging.PagingItem     `description:"分页数据"`
 }
 
-func GetFenweiIndex(condition string, pars interface{}) (items []*BaseFromFenweiIndexList, err error) {
+func GetFenweiIndex(condition string, pars []interface{}) (items []*BaseFromFenweiIndexList, err error) {
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -258,7 +258,7 @@ func GetFenWeiIndexInfoPage(condition string, pars []interface{}) (items []*Base
 		sql += condition
 	}
 	sql += ` ORDER BY fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 

models/data_manage/base_from_mtjh.go

@@ -68,13 +68,13 @@ type BaseFromMtjhMappingItem struct {
 	Frequency             string `description:"频率"`
 }
 
-func GetMtjhMapping(condition string, pars interface{}) (items []*BaseFromMtjhMappingItem, err error) {
+func GetMtjhMapping(condition string, pars []interface{}) (items []*BaseFromMtjhMappingItem, err error) {
 	sql := ` SELECT * FROM base_from_mtjh_mapping WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mtjh_mapping_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_classify.go

@@ -64,14 +64,14 @@ func (m *BaseFromNationalStatisticsClassify) GetItemByCondition(condition string
 	sql := `SELECT * FROM base_from_national_statistics_classify WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) 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["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -86,7 +86,7 @@ func (m *BaseFromNationalStatisticsClassify) GetItemsByCondition(condition strin
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_data.go

@@ -62,14 +62,14 @@ func (m *BaseFromNationalStatisticsData) GetItemByCondition(condition string, pa
 	sql := `SELECT * FROM base_from_national_statistics_data WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) 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["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -84,7 +84,7 @@ func (m *BaseFromNationalStatisticsData) GetItemsByCondition(condition string, p
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_index.go

@@ -67,14 +67,14 @@ func (m *BaseFromNationalStatisticsIndex) GetItemByCondition(condition string, p
 	sql := `SELECT * FROM base_from_national_statistics_index WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) 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["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -93,7 +93,7 @@ func (m *BaseFromNationalStatisticsIndex) GetItemsByCondition(condition string,
 		limit += fmt.Sprintf(` LIMIT %d`, limitNum)
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s %s`, fields, m.TableName(), condition, order, limit)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_oilchem.go

@@ -79,22 +79,22 @@ LEFT JOIN edb_info AS e ON a.index_code=e.edb_code AND e.source=89
 	return
 }
 
-func GetOilchemIndexListCount(condition string, pars interface{}) (count int, err error) {
+func GetOilchemIndexListCount(condition string, pars []interface{}) (count int, err error) {
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
 
-func GetOilchemDataListCount(condition string, pars interface{}) (count int, err error) {
+func GetOilchemDataListCount(condition string, pars []interface{}) (count int, err error) {
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_data WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -135,7 +135,7 @@ func GetOilchemIndexByCondition(condition string, pars []interface{}) (items []*
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -153,7 +153,7 @@ func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{})
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_OILCHEM, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_OILCHEM)...).Scan(&items).Error
 
 	return
 }
@@ -248,7 +248,7 @@ func GetOilchemIndexViewListCount(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	sql += ` ORDER BY b.modify_time ASC `
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_sci_hq_index.go

@@ -58,7 +58,7 @@ func GetSciHqIndexByCondition(condition string, pars []interface{}) (items []*Ba
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -86,7 +86,7 @@ func GetSciHqIndexCountByCondition(condition string, pars []interface{}) (count
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -100,7 +100,7 @@ func GetSciHqIndexAndEdbInfoByCondition(condition string, pars []interface{}) (i
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = o.Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).Scan(&items).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)...).Scan(&items).Error
 
 	return
 }
@@ -223,7 +223,7 @@ func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	sql += ` GROUP BY a.base_from_sci_hq_index_id) AS t `
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_smm.go

@@ -378,7 +378,7 @@ func GetSmmIndexDataListCount(condition string, pars []interface{}) (total int,
 		sql += condition
 	}
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, pars).Scan(&total).Error
+	err = o.Raw(sql, pars...).Scan(&total).Error
 
 	return
 }
@@ -441,7 +441,7 @@ func GetSmmIndexDataListNoPage(condition string, pars []interface{}) (items []*B
 		sql += condition
 	}
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ths_hf.go

@@ -11,9 +11,9 @@ import (
 
 // TODO:有时间还是放在配置里面吧...
 var (
-	ThsHfPeriodArr = []int{1, 3, 5, 10, 15, 30, 60}                                                                                                                                                          // 时间周期
-	ThsHfCPSArr    = []string{"no", "forward1", "forward2", "forward3", "forward4", "backward1", "backward2", "backward3", "backward4"}                                                                      // 复权方式
-	ThsHfFillArr   = []string{"Original", "Previous", "Blank"}                                                                                                                                               // 非交易间隔处理
+	ThsHfPeriodArr = []int{1, 3, 5, 10, 15, 30, 60}                                                                                                                                // 时间周期
+	ThsHfCPSArr    = []string{"no", "forward1", "forward2", "forward3", "forward4", "backward1", "backward2", "backward3", "backward4"}                                            // 复权方式
+	ThsHfFillArr   = []string{"Original", "Previous", "Blank"}                                                                                                                     // 非交易间隔处理
 	ThsHfEdbCodeCn = map[string]string{"open": "开盘价", "close": "收盘价", "high": "最高价", "low": "最低价", "avgprice": "均价", "volume": "成交价", "amt": "成交额", "pct_chg": "涨跌幅", "oi": "持仓量"} // 可选指标代码对应中文
 )
 
@@ -143,7 +143,7 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	}
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = o.Exec(sql, pars).Error
+	err = o.Exec(sql, pars...).Error
 
 	return
 }
@@ -163,7 +163,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -171,7 +171,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -187,7 +187,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ths_hf_classify.go

@@ -126,7 +126,7 @@ func (m *BaseFromThsHfClassify) GetItemByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -134,7 +134,7 @@ func (m *BaseFromThsHfClassify) GetItemByCondition(condition string, pars []inte
 func (m *BaseFromThsHfClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -150,7 +150,7 @@ func (m *BaseFromThsHfClassify) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -297,7 +297,7 @@ func UpdateThsHfClassifyChildByParentClassifyId(classifyIds []int, rootId int, l
 	pars = append(pars, classifyIds)
 	// 更新相关联的二级分类的parentId,和classify_name_second
 	sql := `update base_from_ths_hf_classify SET root_id = ?, level = level+? where base_from_ths_hf_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	err = o.Exec(sql, pars).Error
+	err = o.Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}

models/data_manage/base_from_ths_hf_data.go

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

models/data_manage/base_from_yongyi.go

@@ -52,13 +52,13 @@ type YongyiSingleData struct {
 	DataTime string `orm:"column(data_time)" description:"值"`
 }
 
-func GetYongyiIndex(condition string, pars interface{}) (items []*BaseFromYongyiIndexList, err error) {
+func GetYongyiIndex(condition string, pars []interface{}) (items []*BaseFromYongyiIndexList, err error) {
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, yongyi_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/ccf_stock_classify.go

@@ -94,7 +94,7 @@ func (m *CCFStockClassify) 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 = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -102,7 +102,7 @@ func (m *CCFStockClassify) GetItemByCondition(condition string, pars []interface
 func (m *CCFStockClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -118,7 +118,7 @@ func (m *CCFStockClassify) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/ccf_stock_excel.go

@@ -106,7 +106,7 @@ 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 = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -114,7 +114,7 @@ func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{},
 func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -130,7 +130,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 = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_classify.go

@@ -179,7 +179,7 @@ type ChartClassifyItems struct {
 	SeasonStartDate     string                   `description:"季节性图开始日期"`
 	SeasonEndDate       string                   `description:"季节性图开始日期"`
 	Children            []*ChartClassifyItems    `gorm:"-"`
-	Button              ChartClassifyItemsButton `description:"按钮权限"`
+	Button              ChartClassifyItemsButton `gorm:"-" description:"按钮权限"`
 	IsJoinPermission    int                      `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
 	HaveOperaAuth       bool                     `description:"是否有数据权限，默认：false"`
 }
@@ -230,7 +230,7 @@ func GetChartClassifyByCondition(condition string, pars []interface{}) (item *Ch
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -98,13 +98,22 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	if num <= 0 {
 		return
 	}
+	edbIdArr := make([]string, 0)
+	for _, v := range edbIdList {
+		edbIdArr = append(edbIdArr, strconv.Itoa(v))
+	}
+	edbIdStr := strings.Join(edbIdArr, ",")
 	o := global.DmSQL["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(` + utils.GetOrmInReplace(num) + `)
+	//		ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `) `
+
 	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).Scan(&list).Error
+	        FROM edb_info
+			 WHERE edb_info_id IN(` + edbIdStr + `)
+			ORDER BY FIELD(edb_info_id,` + edbIdStr + `) `
+	err = o.Raw(sql).Find(&list).Error
 
 	return
 }
@@ -155,7 +164,7 @@ func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -362,7 +371,7 @@ func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&item).Error
+	err = o.Raw(sql, pars...).Scan(&item).Error
 
 	return
 }

models/data_manage/chart_framework.go

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

models/data_manage/chart_framework_node.go

@@ -68,7 +68,7 @@ func (m *ChartFrameworkNode) GetItemById(id int) (item *ChartFrameworkNode, err
 func (m *ChartFrameworkNode) GetItemByCondition(condition string, pars []interface{}) (item *ChartFrameworkNode, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -76,7 +76,7 @@ func (m *ChartFrameworkNode) GetItemByCondition(condition string, pars []interfa
 func (m *ChartFrameworkNode) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -92,7 +92,7 @@ func (m *ChartFrameworkNode) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_info.go

@@ -234,7 +234,7 @@ func GetChartInfoCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -402,7 +402,7 @@ func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartI
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -496,6 +496,7 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 		return list, err
 	}
 	var pars []interface{}
+	//pars = append(pars, edbInfoId)
 	sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? `
 	if startDate != "" {
 		sql += ` AND data_time>=? `
@@ -509,8 +510,9 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, edbInfoId, pars).Scan(&list).Error
 
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)...).Scan(&list).Error
+	//err = o.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 
@@ -646,7 +648,7 @@ func getEdbDataListMinAndMaxByMysql(source, subSource, edbInfoId int, startDate,
 
 	var tmpData MaxOrMinData
 
-	err = o.Raw(sql, edbInfoId, pars).Scan(&tmpData).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)...).Scan(&tmpData).Error
 	if err != nil {
 		return
 	}
@@ -1710,7 +1712,7 @@ func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*Char
 	if keyword == "" {
 		sql += ` LIMIT 100 `
 	}
-	err = o.Raw(sql, pars).Scan(&searchList).Error
+	err = o.Raw(sql, pars...).Scan(&searchList).Error
 
 	return
 }
@@ -1934,29 +1936,29 @@ type ChartInfoView struct {
 	Sort              int    `description:"排序字段，数字越小越排前面"`
 	IsAdd             bool   `description:"true:已加入我的图库,false:未加入我的图库"`
 	MyChartId         int
-	MyChartClassifyId string `description:"我的图表分类，多个用逗号隔开"`
-	ChartClassify     []*ChartClassifyView
-	EdbEndDate        string `description:"指标最新更新日期"`
-	XMin              string `description:"图表X轴最小值"`
-	XMax              string `description:"图表X轴最大值"`
-	LeftMin           string `description:"图表左侧最小值"`
-	LeftMax           string `description:"图表左侧最大值"`
-	RightMin          string `description:"图表右侧最小值"`
-	RightMax          string `description:"图表右侧最大值"`
-	Right2Min         string `description:"图表右侧最小值"`
-	Right2Max         string `description:"图表右侧最大值"`
-	MinMaxSave        int    `description:"是否手动保存过上下限：0-否；1-是"`
-	IsEdit            bool   `description:"是否有编辑权限"`
-	IsEnChart         bool   `description:"是否展示英文标识"`
-	WarnMsg           string `description:"错误信息"`
-	Disabled          int    `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig         string `description:"柱方图的配置，json数据" json:"-"`
-	Source            int    `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
+	MyChartClassifyId string               `description:"我的图表分类，多个用逗号隔开"`
+	ChartClassify     []*ChartClassifyView `gorm:"-"`
+	EdbEndDate        string               `description:"指标最新更新日期"`
+	XMin              string               `description:"图表X轴最小值"`
+	XMax              string               `description:"图表X轴最大值"`
+	LeftMin           string               `description:"图表左侧最小值"`
+	LeftMax           string               `description:"图表左侧最大值"`
+	RightMin          string               `description:"图表右侧最小值"`
+	RightMax          string               `description:"图表右侧最大值"`
+	Right2Min         string               `description:"图表右侧最小值"`
+	Right2Max         string               `description:"图表右侧最大值"`
+	MinMaxSave        int                  `description:"是否手动保存过上下限：0-否；1-是"`
+	IsEdit            bool                 `description:"是否有编辑权限"`
+	IsEnChart         bool                 `description:"是否展示英文标识"`
+	WarnMsg           string               `description:"错误信息"`
+	Disabled          int                  `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig         string               `description:"柱方图的配置，json数据" json:"-"`
+	Source            int                  `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
 	//CorrelationLeadUnit string `description:"相关性图表-领先单位"`
 	ExtraConfig       string          `description:"图表额外配置,json数据"`
 	ChartSource       string          `description:"图表来源str"`
 	ChartSourceEn     string          `description:"图表来源（英文）"`
-	Button            ChartViewButton `description:"操作按钮"`
+	Button            ChartViewButton `gorm:"-" description:"操作按钮"`
 	SeasonExtraConfig string          `description:"季节性图表中的配置,json数据"`
 	StartYear         int             `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
 	ChartThemeId      int             `description:"图表应用主题ID"`
@@ -2791,7 +2793,7 @@ func GetChartInfoBySourceAndParentId(source, parentId, adminId int) (items []*Ch
 		pars = append(pars, adminId)
 	}
 	sql += ` ORDER BY sort asc,chart_info_id ASC `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_info_correlation.go

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

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -83,7 +83,7 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 
 	sql += ` ORDER BY data_time ASC `
 
-	err = global.DmSQL["data"].Raw(sql, endInfoId, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, endInfoId)...).Find(&list).Error
 	return
 }
 

models/data_manage/com_trade_data.go

@@ -65,7 +65,7 @@ func GetComTradeListCount(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/com_trade_index.go

@@ -23,7 +23,7 @@ func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTrad
 		sql += condition
 	}
 	sql += `ORDER BY com_trade_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 
 	return
 }

models/data_manage/data_manage_permission/chart.go

@@ -426,7 +426,7 @@ func GetPermissionChartIdList(userId, chartInfoId int) (idList []int, err error)
 		sql += ` AND chart_info_id = ? `
 		pars = append(pars, chartInfoId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 	return
 }
 
@@ -453,7 +453,7 @@ func GetPermissionChartClassifyIdList(userId, classifyId int) (idList []int, err
 		sql += ` AND chart_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 	return
 }
 

models/data_manage/data_manage_permission/edb.go

@@ -437,7 +437,7 @@ func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 		sql += ` AND edb_info_id = ? `
 		pars = append(pars, edbInfoId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 
 	return
 }
@@ -465,7 +465,7 @@ func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err e
 		sql += ` AND edb_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 	return
 }
 

models/data_manage/data_manage_permission/excel.go

@@ -330,7 +330,7 @@ func GetPermissionExcelIdList(userId, excelInfoId int) (idList []int, err error)
 		sql += ` AND excel_info_id = ? `
 		pars = append(pars, excelInfoId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&idList).Error
 
 	return
 }
@@ -350,7 +350,7 @@ func GetPermissionExcelClassifyIdList(userId, classifyId int) (idList []int, err
 		sql += ` AND excel_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&idList).Error
 
 	return
 }
@@ -960,7 +960,7 @@ func GetAdminAuthExcelInfoPermission(source, adminId int, keywords string) (item
 		pars = append(pars, keywords)
 	}
 	sql += ` ORDER BY a.create_time ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/edb_classify.go

@@ -618,7 +618,7 @@ func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, lev
 	sql := `update edb_classify 
 SET root_id = ?, level = level+?
 where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	err = global.DmSQL["data"].Exec(sql, pars).Error
+	err = global.DmSQL["data"].Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}

models/data_manage/edb_data_base.go

@@ -248,7 +248,7 @@ func GetEdbDataAllByEdbCodeByMysql(edbCode string, source, subSource, limit int)
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -334,7 +334,7 @@ func GetBaseIndexInfoByEdbCode(edbCode string, source int) (item *BaseIndexInfo,
 	sql := ` SELECT * FROM %s WHERE index_code=? `
 
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -357,7 +357,7 @@ func GetEdbDataAllByEdbCodeAndSubSource(edbCode string, source, subSource, limit
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -397,7 +397,7 @@ func GetEdbDataAllByEdbCodes(edbCodes []string, limit int) (items []*EdbInfoSear
 		sql += `  LIMIT ?  `
 		pars = append(pars, limit)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/edb_info.go

@@ -354,7 +354,7 @@ func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -488,7 +488,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoL
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&item).Error
+	err = o.Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -501,7 +501,7 @@ func GetEdbDataCountByCondition(condition string, pars []interface{}, source, su
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -534,7 +534,7 @@ func GetAllEdbDataListByCondition(condition string, pars []interface{}, source,
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -719,7 +719,7 @@ func GetEdbInfoFilter(condition string, pars []interface{}) (list []*EdbInfoList
 		sql += condition
 	}
 	sql += ` ORDER BY create_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -744,7 +744,7 @@ func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1246,7 +1246,7 @@ func GetEdbInfoFilterList(condition string, pars []interface{}, startSize, pageS
 	o := global.DmSQL["data"]
 
 	sql := ` SELECT count(1) total FROM edb_info where 1=1 ` + condition + ` ORDER BY edb_info_id DESC `
-	err = o.Raw(sql, pars).Scan(&total).Error
+	err = o.Raw(sql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1271,7 +1271,7 @@ func GetNextEdbInfoByCondition(condition string, pars []interface{}) (item *EdbI
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , edb_info_id asc LIMIT 1 "
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -1310,7 +1310,7 @@ func GetEdbInfoByConditionCount(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -1461,7 +1461,7 @@ func GetEdbInfoByClassifyId(classifyId, edbInfoType, adminId int) (items []*EdbC
 		pars = append(pars, adminId)
 	}
 	sql += ` order by sort asc,edb_info_id asc `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1603,7 +1603,8 @@ func GetEdbBaseInfoList(condition string, pars []interface{}, orderBy string, st
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).Scan(&total).Error
+
+	err = o.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1620,6 +1621,7 @@ func GetEdbBaseInfoList(condition string, pars []interface{}, orderBy string, st
 		sql += ` ORDER BY edb_info_id ASC `
 	}
 	sql += `  LIMIT ?,? `
+
 	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
@@ -1812,7 +1814,7 @@ func GetEdbInfoByClassifyIdAndSource(classifyId, edbInfoType, source int) (items
 
 	pars := []interface{}{classifyId, edbInfoType, source}
 	sql += ` order by sort asc,edb_info_id asc `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1849,7 +1851,7 @@ func GetEdbInfoFieldList(cond string, pars []interface{}, fields []string) (item
 	}
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT %s FROM edb_info WHERE 1=1 %s `, field, cond)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1865,7 +1867,7 @@ func GetEdbInfoListByCond(condition string, pars []interface{}) (list []*EdbInfo
 		sql += condition
 	}
 	sql += ` ORDER BY create_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/data_manage/edb_info_relation.go

@@ -276,7 +276,7 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).Scan(&total).Error
+	err = o.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/edb_info_updates.go

@@ -16,7 +16,7 @@ func GetUpdatesStatistical(condition string, pars []interface{}) (list []*Update
 			WHERE 1=1 `
 	sql += condition
 	sql += ` GROUP BY source  `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -117,7 +117,7 @@ func GetUpdatesListTotal(condition string, pars []interface{}) (count int, err e
 	sql := ` SELECT COUNT(1) AS count FROM edb_info
 			WHERE 1=1 `
 	sql += condition
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/edb_source.go

@@ -39,7 +39,7 @@ 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 = o.Raw(sql, pars).Find(&items).Error
+	err = o.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -56,7 +56,7 @@ type EdbSourceChild struct {
 // 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.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/excel/excel_chart_edb.go

@@ -648,6 +648,6 @@ func GetBalanceChartEdbByCondition(condition string, pars []interface{}) (item *
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }

models/data_manage/excel/excel_classify.go

@@ -179,7 +179,7 @@ func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *Ex
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -198,7 +198,7 @@ func GetNextExcelClassifyByCondition(condition string, pars []interface{}) (item
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/data_manage/excel/excel_edb_mapping.go

@@ -241,6 +241,6 @@ func GetExcelEdbMappingItemByExcelInfoIdOrKeyword(excelInfoId int, keyword strin
 			%s
 		ORDER BY
 			b.excel_edb_mapping_id ASC`, cond)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/excel/excel_info.go

@@ -62,7 +62,7 @@ type MyExcelInfoList struct {
 	HaveOperaAuth      bool                  `description:"是否有数据权限"`
 	UpdateUserId       int                   `description:"更新人id"`
 	UpdateUserRealName string                `description:"更新人真实姓名"`
-	Button             ExcelInfoDetailButton `description:"操作权限"`
+	Button             ExcelInfoDetailButton `description:"操作权限" gorm:"-"`
 	CanEdit            bool                  `description:"是否可编辑"`
 	Editor             string                `description:"编辑人"`
 }
@@ -329,7 +329,7 @@ func GetExcelInfoCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -376,7 +376,7 @@ func GetNoContentExcelInfoListByConditionNoPage(condition string, pars []interfa
 	}
 
 	sql += ` ORDER BY excel_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -395,7 +395,7 @@ func GetExcelInfoListByCondition(condition string, pars []interface{}) (items []
 		sql += condition
 	}
 	sql += ` ORDER BY sort asc, excel_info_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -414,7 +414,7 @@ func GetNextExcelInfoByCondition(condition string, pars []interface{}) (item *Ex
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time desc LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -591,7 +591,7 @@ func GetNoContentExcelListByConditionNoPage(condition string, pars []interface{}
 	}
 	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
 	sql += " ORDER BY create_time DESC"
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -607,7 +607,7 @@ func GetExcelListCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/factor_edb_series.go

@@ -2,9 +2,9 @@ package data_manage
 
 import (
 	"encoding/json"
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -53,12 +53,8 @@ func (m *FactorEdbSeries) Cols() FactorEdbSeriesCols {
 }
 
 func (m *FactorEdbSeries) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -66,21 +62,21 @@ func (m *FactorEdbSeries) CreateMulti(items []*FactorEdbSeries) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesId).Error
+
 	return
 }
 
@@ -88,9 +84,9 @@ func (m *FactorEdbSeries) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -98,39 +94,39 @@ func (m *FactorEdbSeries) RemoveByCondition(condition string, pars []interface{}
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemById(id int) (item *FactorEdbSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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.DmSQL["data"].Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -140,12 +136,12 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,7 +153,8 @@ func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []inter
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -202,12 +199,7 @@ func (m *FactorEdbSeries) CreateSeriesAndMapping(item *FactorEdbSeries, mappings
 		err = fmt.Errorf("series is nil")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -216,24 +208,24 @@ func (m *FactorEdbSeries) CreateSeriesAndMapping(item *FactorEdbSeries, mappings
 		_ = tx.Commit()
 	}()
 
-	id, e := tx.Insert(item)
+	e := tx.Create(item).Error
 	if e != nil {
 		err = fmt.Errorf("insert series err: %v", e)
 		return
 	}
-	seriesId = int(id)
 	item.FactorEdbSeriesId = seriesId
 
 	if len(mappings) > 0 {
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = seriesId
 		}
-		_, e = tx.InsertMulti(200, mappings)
+		e = tx.CreateInBatches(mappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return
 		}
 	}
+
 	return
 }
 
@@ -243,12 +235,8 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		err = fmt.Errorf("series is nil")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	o := global.DmSQL["data"]
+	tx := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -257,7 +245,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		_ = tx.Commit()
 	}()
 
-	_, e = tx.Update(item, updateCols...)
+	e := tx.Select(updateCols).Updates(item).Error
 	if e != nil {
 		err = fmt.Errorf("update series err: %v", e)
 		return
@@ -269,7 +257,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 = tx.Raw(sql, pars).Exec()
+	e = tx.Exec(sql, pars).Error
 	if e != nil {
 		err = fmt.Errorf("remove mapping err: %v", e)
 		return
@@ -279,12 +267,13 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = item.FactorEdbSeriesId
 		}
-		_, e = tx.InsertMulti(200, mappings)
+		e = tx.CreateInBatches(mappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return
 		}
 	}
+
 	return
 }
 
@@ -364,12 +353,8 @@ func (a FactorEdbSeriesCorrelationMatrixOrder) Less(i, j int) bool {
 
 // RemoveSeriesAndMappingByFactorEdbSeriesId 删除系列和指标关联
 func (m *FactorEdbSeries) RemoveSeriesAndMappingByFactorEdbSeriesId(factorEdbSeriesChartMapping *FactorEdbSeriesChartMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	o := global.DmSQL["data"]
+	tx := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -393,7 +378,7 @@ func (m *FactorEdbSeries) RemoveSeriesAndMappingByFactorEdbSeriesId(factorEdbSer
 	pars := make([]interface{}, 0)
 	pars = append(pars, factorEdbSeriesId)
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, seriesOb.TableName(), cond)
-	_, e = tx.Raw(sql, pars).Exec()
+	e := tx.Exec(sql, pars).Error
 	if e != nil {
 		err = fmt.Errorf("remove FactorEdbSeries err: %v", e)
 		return
@@ -405,7 +390,7 @@ func (m *FactorEdbSeries) RemoveSeriesAndMappingByFactorEdbSeriesId(factorEdbSer
 	pars1 := make([]interface{}, 0)
 	pars1 = append(pars1, factorEdbSeriesId)
 	sql = fmt.Sprintf(`DELETE FROM %s WHERE %s`, mappingOb.TableName(), cond1)
-	_, e = tx.Raw(sql, pars1).Exec()
+	e = tx.Exec(sql, pars1).Error
 	if e != nil {
 		err = fmt.Errorf("remove mapping err: %v", e)
 		return
@@ -416,11 +401,12 @@ func (m *FactorEdbSeries) RemoveSeriesAndMappingByFactorEdbSeriesId(factorEdbSer
 	pars2 := make([]interface{}, 0)
 	pars2 = append(pars2, factorEdbSeriesId)
 	sql = fmt.Sprintf(`DELETE FROM %s WHERE %s`, dataOb.TableName(), cond2)
-	_, e = tx.Raw(sql, pars2).Exec()
+	e = tx.Exec(sql, pars2).Error
 	if e != nil {
 		err = fmt.Errorf("remove mapping err: %v", e)
 		return
 	}
+
 	return
 }
 

models/data_manage/factor_edb_series_calculate_data.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -52,12 +52,9 @@ func (m *FactorEdbSeriesCalculateData) Cols() FactorEdbSeriesCalculateDataCols {
 }
 
 func (m *FactorEdbSeriesCalculateData) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesCalculateDataId = int(id)
+	o := global.DmSQL["data"]
+	err = o.Create(m).Error
+
 	return
 }
 
@@ -65,21 +62,21 @@ func (m *FactorEdbSeriesCalculateData) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(500, items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateDataId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
+
 	return
 }
 
@@ -87,9 +84,9 @@ func (m *FactorEdbSeriesCalculateData) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -97,39 +94,42 @@ func (m *FactorEdbSeriesCalculateData) RemoveByCondition(condition string, pars
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemById(id int) (item *FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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 = o.Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +139,13 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -156,7 +157,8 @@ func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string,
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 

models/data_manage/factor_edb_series_calculate_data_qjjs.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -52,12 +52,8 @@ func (m *FactorEdbSeriesCalculateDataQjjs) Cols() FactorEdbSeriesCalculateDataQj
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesCalculateDataId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -65,21 +61,21 @@ func (m *FactorEdbSeriesCalculateDataQjjs) CreateMulti(items []*FactorEdbSeriesC
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(500, items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateDataId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
+
 	return
 }
 
@@ -87,9 +83,9 @@ func (m *FactorEdbSeriesCalculateDataQjjs) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Raw(sql, ids).Error
+
 	return
 }
 
@@ -97,39 +93,40 @@ func (m *FactorEdbSeriesCalculateDataQjjs) RemoveByCondition(condition string, p
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemById(id int) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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 = o.Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +136,13 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -156,7 +154,8 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition str
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -206,7 +205,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoI
 
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, m.TableName())
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
+
 	return
 }

models/data_manage/factor_edb_series_calculate_func.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -43,12 +43,8 @@ func (m *FactorEdbSeriesCalculateFunc) Cols() FactorEdbSeriesCalculateFuncCols {
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesCalculateFuncId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -56,21 +52,21 @@ func (m *FactorEdbSeriesCalculateFunc) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateFuncId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesCalculateFuncId).Error
+
 	return
 }
 
@@ -78,39 +74,40 @@ func (m *FactorEdbSeriesCalculateFunc) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemById(id int) (item *FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrmUsingDB("data")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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.DmSQL["data"].Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -120,12 +117,13 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -137,7 +135,8 @@ func (m *FactorEdbSeriesCalculateFunc) GetPageItemsByCondition(condition string,
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).First(&items).Error
+
 	return
 }
 

models/data_manage/factor_edb_series_chart_mapping.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -63,12 +63,8 @@ func (m *FactorEdbSeriesChartMapping) Cols() MultipleFactorSeriesChartMappingCol
 }
 
 func (m *FactorEdbSeriesChartMapping) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesChartMappingId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -76,21 +72,21 @@ func (m *FactorEdbSeriesChartMapping) CreateMulti(items []*FactorEdbSeriesChartM
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesChartMappingId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesChartMappingId).Error
+
 	return
 }
 
@@ -98,9 +94,9 @@ func (m *FactorEdbSeriesChartMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -108,46 +104,47 @@ func (m *FactorEdbSeriesChartMapping) RemoveByCondition(condition string, pars [
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemById(id int) (item *FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemByChartInfoId(id int) (item *FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().ChartInfoId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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.DmSQL["data"].Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,12 +154,13 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -174,26 +172,23 @@ func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string,
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
+
 	return
 }
 
 // GetDistinctSeriesIdByChartId 获取图表关联的系列ID
 func (m *FactorEdbSeriesChartMapping) GetDistinctSeriesIdByChartId(chartId int) (seriesIds []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT DISTINCT %s FROM %s WHERE %s = ?`, m.Cols().FactorEdbSeriesId, m.TableName(), m.Cols().ChartInfoId)
-	_, err = o.Raw(sql, chartId).QueryRows(&seriesIds)
+	err = o.Raw(sql, chartId).Scan(&seriesIds).Error
+
 	return
 }
 
 // ClearAndCreateMapping 新增图表关联
 func (m *FactorEdbSeriesChartMapping) ClearAndCreateMapping(seriesIds []int, mappings []*FactorEdbSeriesChartMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -204,7 +199,7 @@ func (m *FactorEdbSeriesChartMapping) ClearAndCreateMapping(seriesIds []int, map
 
 	if len(seriesIds) > 0 {
 		sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s) AND %s = 0`, m.TableName(), m.Cols().FactorEdbSeriesId, utils.GetOrmInReplace(len(seriesIds)), m.Cols().ChartInfoId)
-		_, e = tx.Raw(sql, seriesIds).Exec()
+		e := tx.Exec(sql, seriesIds).Error
 		if e != nil {
 			err = fmt.Errorf("remove chart mapping err: %v", e)
 			return
@@ -212,12 +207,13 @@ func (m *FactorEdbSeriesChartMapping) ClearAndCreateMapping(seriesIds []int, map
 	}
 
 	if len(mappings) > 0 {
-		_, e = tx.InsertMulti(200, mappings)
+		e := tx.CreateInBatches(mappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return
 		}
 	}
+
 	return
 }
 

models/data_manage/factor_edb_series_mapping.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -43,12 +43,8 @@ func (m *FactorEdbSeriesMapping) Cols() FactorEdbSeriesMappingCols {
 }
 
 func (m *FactorEdbSeriesMapping) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesMappingId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -56,21 +52,21 @@ func (m *FactorEdbSeriesMapping) CreateMulti(items []*FactorEdbSeriesMapping) (e
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesMappingId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.FactorEdbSeriesMappingId).Error
+
 	return
 }
 
@@ -78,9 +74,9 @@ func (m *FactorEdbSeriesMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -88,39 +84,38 @@ func (m *FactorEdbSeriesMapping) RemoveByCondition(condition string, pars []inte
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemById(id int) (item *FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	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.DmSQL["data"].Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -130,12 +125,12 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -147,7 +142,8 @@ func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -169,8 +165,8 @@ func (m *FactorEdbSeriesMapping) Format2Item() (item *FactorEdbSeriesMappingItem
 }
 
 func (m *FactorEdbSeriesMapping) GetItemBySeriesId(seriesId int) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().FactorEdbSeriesId)
-	_, err = o.Raw(sql, seriesId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, seriesId).Scan(&items).Error
+
 	return
 }

models/data_manage/future_good/chart_info_future_good_profit.go

@@ -66,7 +66,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.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
@@ -81,7 +81,7 @@ 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.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/future_good/future_good_chart_classify.go

@@ -76,7 +76,7 @@ func GetFutureGoodChartClassifyByCondition(condition string, pars []interface{})
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -88,7 +88,7 @@ func GetNextFutureGoodChartClassifyByCondition(condition string, pars []interfac
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

@@ -55,7 +55,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -113,7 +113,7 @@ func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -130,7 +130,7 @@ func GetFutureGoodEdbExchangeList(condition string, pars []interface{}) (list []
 		sql += condition
 	}
 	sql += ` GROUP BY exchange `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/data_manage/future_good/future_good_edb_info_data.go

@@ -60,7 +60,7 @@ func GetFutureGoodEdbDataListCount(condition string, pars []interface{}) (count
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -100,7 +100,7 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, futureGoodEdbInfoId, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoId)...).Scan(&list).Error
 
 	return
 }
@@ -118,7 +118,7 @@ func GetFutureGoodEdbDataListByIdsAndDate(futureGoodEdbInfoIds []int, startDate,
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, futureGoodEdbInfoIds, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoIds)...).Scan(&list).Error
 
 	return
 }

models/data_manage/future_good_chart_info.go

@@ -1,19 +1,15 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EditFutureGoodChartEnInfoAndEdbEnInfo 更改商品价格曲线英文信息
 func EditFutureGoodChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn string, edbInfoId int, edbNameEn, edbUnitEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -28,14 +24,14 @@ func EditFutureGoodChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn string,
 			  modify_time = NOW()
 			WHERE chart_info_id = ?`
 
-	_, err = to.Raw(sql, chartNameEn, chartInfoId).Exec()
+	err = to.Exec(sql, chartNameEn, chartInfoId).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
 	}
 	var count int
 	csql := `SELECT COUNT(1) AS count FROM chart_edb_mapping WHERE chart_info_id=? AND edb_info_id=? AND source = 1 `
-	err = to.Raw(csql, chartInfoId, edbInfoId).QueryRow(&count)
+	err = to.Raw(csql, chartInfoId, edbInfoId).Scan(&count).Error
 	if err != nil {
 		fmt.Println("QueryRow Err:", err.Error())
 		return err
@@ -46,7 +42,7 @@ func EditFutureGoodChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn string,
 			  unit_en = ?,
 			  modify_time = NOW()
 			WHERE edb_info_id = ? `
-		_, err = to.Raw(msql, edbNameEn, edbUnitEn, edbInfoId).Exec()
+		err = to.Exec(msql, edbNameEn, edbUnitEn, edbInfoId).Error
 		if err != nil {
 			fmt.Println("edb_info Err:" + err.Error())
 			return err
@@ -79,11 +75,7 @@ type EditFutureGoodChartInfoBaseReq struct {
 // @param lang string
 // @return err error
 func EditBaseFutureGoodChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *EditFutureGoodChartInfoBaseReq, lang string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -104,7 +96,7 @@ func EditBaseFutureGoodChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *EditFutu
 	}
 	chartInfo.ModifyTime = time.Now()
 	updateChartCols = append(updateChartCols, "ModifyTime", "BarConfig")
-	_, err = to.Update(chartInfo, updateChartCols...)
+	err = to.Select(updateChartCols).Updates(chartInfo).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
@@ -138,22 +130,19 @@ func EditBaseFutureGoodChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *EditFutu
 		}
 		msql += ` WHERE edb_info_id = ? `
 		pars = append(pars, v.EdbInfoId)
-		_, err = to.Raw(msql, pars...).Exec()
+		err = to.Exec(msql, pars...).Error
 		if err != nil {
 			fmt.Println("edb_info Err:" + err.Error())
 			return err
 		}
 	}
+
 	return
 }
 
 // EditFutureGoodProfitChartEnInfoAndEdbEnInfo 更改商品利润曲线英文信息
 func EditFutureGoodProfitChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn string, edbInfoId int, edbNameEn, edbUnitEn, profitNameEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -166,7 +155,7 @@ func EditFutureGoodProfitChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn st
 			SET chart_name_en =?,modify_time = NOW()
 			WHERE chart_info_id = ?`
 
-	_, err = to.Raw(sql, chartNameEn, chartInfoId).Exec()
+	err = to.Exec(sql, chartNameEn, chartInfoId).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return
@@ -176,7 +165,7 @@ func EditFutureGoodProfitChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn st
 	sql = ` UPDATE  edb_info
 			SET edb_name_en = ?,unit_en = ?,modify_time = NOW()
 			WHERE edb_info_id = ? `
-	_, err = to.Raw(sql, edbNameEn, edbUnitEn, edbInfoId).Exec()
+	err = to.Exec(sql, edbNameEn, edbUnitEn, edbInfoId).Error
 	if err != nil {
 		fmt.Println("edb_info Err:" + err.Error())
 		return
@@ -186,7 +175,7 @@ func EditFutureGoodProfitChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn st
 	sql = ` UPDATE  chart_info_future_good_profit
 			SET profit_name_en = ?,modify_time = NOW()
 			WHERE chart_info_id = ? `
-	_, err = to.Raw(sql, profitNameEn, chartInfoId).Exec()
+	err = to.Exec(sql, profitNameEn, chartInfoId).Error
 	if err != nil {
 		fmt.Println("chart_info_future_good_profit Err:" + err.Error())
 		return
@@ -208,11 +197,7 @@ func EditFutureGoodProfitChartEnInfoAndEdbEnInfo(chartInfoId int, chartNameEn st
 // @param lang string
 // @return err error
 func EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *EditFutureGoodChartInfoBaseReq, lang string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -233,7 +218,7 @@ func EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *Ed
 	}
 	chartInfo.ModifyTime = time.Now()
 	updateChartCols = append(updateChartCols, "ModifyTime", "ExtraConfig")
-	_, err = to.Update(chartInfo, updateChartCols...)
+	err = to.Select(updateChartCols).Updates(chartInfo).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
@@ -269,7 +254,7 @@ func EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *Ed
 		}
 		msql += ` WHERE edb_info_id = ? `
 		pars = append(pars, v.EdbInfoId)
-		_, err = to.Raw(msql, pars...).Exec()
+		err = to.Exec(msql, pars...).Error
 		if err != nil {
 			fmt.Println("edb_info Err:" + err.Error())
 			return err
@@ -284,7 +269,7 @@ func EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartInfo *ChartInfo, req *Ed
 	default:
 		sql = ` UPDATE  chart_info_future_good_profit SET profit_name = ?,modify_time = NOW() WHERE chart_info_id = ? `
 	}
-	_, err = to.Raw(sql, req.ProfitName, chartInfo.ChartInfoId).Exec()
+	err = to.Exec(sql, req.ProfitName, chartInfo.ChartInfoId).Error
 	if err != nil {
 		fmt.Println("chart_info_future_good_profit Err:" + err.Error())
 		return

models/data_manage/my_chart.go

@@ -47,7 +47,7 @@ func GetChartListCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -140,7 +140,7 @@ func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (c
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -442,7 +442,7 @@ func GetMyChartListCountByCondition(condition string, pars []interface{}) (count
 		sql += condition
 	}
 	sql1 := ` SELECT COUNT(1) AS count FROM (` + sql + ` GROUP BY a.chart_info_id ) d`
-	err = global.DmSQL["data"].Raw(sql1, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql1, pars...).Scan(&count).Error
 	return
 }
 
@@ -570,11 +570,20 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 
 	//sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
 
-	sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	sql := ` SELECT 
+           a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
+            FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 AND a.admin_id=?
-			GROUP BY a.chart_info_id `
+			GROUP BY   
+			a.chart_info_id,
+			a.my_chart_id,
+			a.chart_info_id,
+			a.source,
+			a.admin_id,
+			a.create_time,
+			a.modify_time `
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&item).Error
 	return
 }
@@ -605,7 +614,7 @@ func GetMyChartSearchByCondition(condition string, pars []interface{}) (item []*
 		sql += condition
 	}
 	sql += " GROUP BY a.chart_info_id ORDER BY c.sort DESC "
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -680,7 +689,8 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 	//sql += ` GROUP BY a.chart_info_id  `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	sql := `SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	sql := `SELECT a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
+            FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 
@@ -688,8 +698,15 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY a.chart_info_id  `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	sql += ` GROUP BY   
+    a.chart_info_id,
+    a.my_chart_id,
+    a.chart_info_id,
+    a.source,
+    a.admin_id,
+    a.create_time,
+    a.modify_time  `
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -705,7 +722,7 @@ func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *My
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -993,7 +1010,7 @@ func GetCompanyPublicClassifyList(condition string, pars []interface{}) (item []
 	sql := ` SELECT * FROM my_chart_classify WHERE 1 = 1 AND is_public = 1 AND is_company_public = 1 `
 	sql += condition
 	sql += " ORDER BY public_time asc"
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -1131,7 +1148,7 @@ func GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition string, par
 		sql += condition
 	}
 	sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -1174,7 +1191,7 @@ func GetRelationChartListCountByCondition(condition string, pars []interface{})
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -1278,6 +1295,6 @@ func GetMyChartClassifyIdAndNum(cond string, pars []interface{}) (items []*MyCha
 			1 = 1 %s
 		GROUP BY
 			a.my_chart_classify_id`, cond)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/mysteel_chemical_index.go

@@ -116,7 +116,7 @@ func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)...).Find(&items).Error
 	return
 }
 
@@ -200,26 +200,26 @@ func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []
 		sql += condition
 	}
 	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // MysteelChemicalList 钢联化工指标列表
 type MysteelChemicalList struct {
-	Id                                int                `orm:"column(base_from_mysteel_chemical_index_id)"`
-	BaseFromMysteelChemicalClassifyId int                `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
-	ParentClassifyId                  int                `description:"钢联化工指标父级分类id"`
-	IndexCode                         string             `description:"指标编码"`
-	IndexName                         string             `description:"指标名称"`
-	UnitName                          string             `orm:"column(unit)"`
-	UniqueCode                        string             `description:"唯一编码"`
-	FrequencyName                     string             `orm:"column(frequency)"`
-	EdbInfoId                         int                `description:"指标库的id"`
-	UpdateTime                        string             `orm:"column(modify_time)"`
-	IsStop                            int                `description:"是否停更:1:停更,0:未停更"`
-	IsSupplierStop                    int                `description:"是否供应商停更:1:停更,0:未停更"`
-	Paging                            *paging.PagingItem `description:"分页数据"`
-	DataList                          []*MysteelChemicalData
+	Id                                int                    `orm:"column(base_from_mysteel_chemical_index_id)"`
+	BaseFromMysteelChemicalClassifyId int                    `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
+	ParentClassifyId                  int                    `description:"钢联化工指标父级分类id"`
+	IndexCode                         string                 `description:"指标编码"`
+	IndexName                         string                 `description:"指标名称"`
+	UnitName                          string                 `orm:"column(unit)"`
+	UniqueCode                        string                 `description:"唯一编码"`
+	FrequencyName                     string                 `orm:"column(frequency)"`
+	EdbInfoId                         int                    `description:"指标库的id"`
+	UpdateTime                        string                 `orm:"column(modify_time)"`
+	IsStop                            int                    `description:"是否停更:1:停更,0:未停更"`
+	IsSupplierStop                    int                    `description:"是否供应商停更:1:停更,0:未停更"`
+	Paging                            *paging.PagingItem     `description:"分页数据"`
+	DataList                          []*MysteelChemicalData `gorm:"-"`
 }
 
 // MysteelChemicalData 钢联化工数据列表
@@ -245,7 +245,7 @@ func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*Mys
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -477,7 +477,7 @@ func GetMysteelChemicalIndexCount(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -685,7 +685,7 @@ func GetMysteelChemicalBaseInfoList(condition string, pars []interface{}, orderB
 	if condition != "" {
 		totalSql += condition
 	}
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/predict_edb_rule_data.go

@@ -2,6 +2,7 @@ package data_manage
 
 import (
 	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -44,6 +45,6 @@ func GetPredictEdbRuleDataList(edbInfoId, configId int, startDate, endDate strin
 		pars = append(pars, endDate)
 	}
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, edbInfoId, configId, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, edbInfoId, configId)).Find(&list).Error
 	return
 }

models/data_manage/sci_data.go

@@ -53,7 +53,7 @@ type SciIndex struct {
 	ModifyTime         string
 }
 
-func GetSciIndex(condition string, pars interface{}) (items []*SciIndex, err error) {
+func GetSciIndex(condition string, pars []interface{}) (items []*SciIndex, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_sci_index WHERE 1=1  `
 	//if condition != "" {
@@ -67,7 +67,7 @@ func GetSciIndex(condition string, pars interface{}) (items []*SciIndex, err err
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_sci_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/data_manage/smm_data.go

@@ -78,7 +78,7 @@ type SmmIndexItem struct {
 	EndValue           float64 `description:"指标的最新值"`
 }
 
-func GetSmmIndex(condition string, pars interface{}) (items []*SmmIndex, err error) {
+func GetSmmIndex(condition string, pars []interface{}) (items []*SmmIndex, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_smm_index WHERE 1=1  `
 	//if condition != "" {
@@ -92,7 +92,7 @@ func GetSmmIndex(condition string, pars interface{}) (items []*SmmIndex, err err
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_smm_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -336,7 +336,7 @@ func GetSmmBaseInfoList(condition string, pars []interface{}, orderBy string, st
 	if condition != "" {
 		totalSql += condition
 	}
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -39,7 +39,7 @@ func GetVarietyEdbData(varietyEdbId int, startDate, endDate string) (items []*Ba
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, varietyEdbId, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, varietyEdbId)...).Scan(&items).Error
 
 	return
 }

models/data_manage/supply_analysis/variety.go

@@ -147,7 +147,7 @@ func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
 
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		fmt.Println("Count Err:", err)
 		return
@@ -172,7 +172,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.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_source/base_from_sci99.go

@@ -124,7 +124,7 @@ func GetBaseFromSci99Classify() (list []*BaseFromSci99Classify, err error) {
 	return
 }
 
-func GetSci99Index(condition string, pars interface{}) (items []*BaseFromSci99IndexList, err error) {
+func GetSci99Index(condition string, pars []interface{}) (items []*BaseFromSci99IndexList, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
 	//if condition != "" {
@@ -137,7 +137,7 @@ func GetSci99Index(condition string, pars interface{}) (items []*BaseFromSci99In
 		sql += condition
 	}
 	sql += `ORDER BY base_from_sci_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_source/guagnzhouqihuo.go

@@ -169,7 +169,7 @@ WHERE `
 		}
 		sql += ` ORDER BY a.index_code ASC `
 		//_, err = o.Raw(sql, pars).QueryRows(&list)
-		err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	} else {
 		condition += ` AND a.base_from_trade_guangzhou_contract_id=? `
@@ -185,7 +185,7 @@ WHERE `
 		}
 		sql += ` ORDER BY a.index_code ASC `
 		//_, err = o.Raw(sql, pars).QueryRows(&list)
-		err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	}
 }
@@ -201,6 +201,6 @@ WHERE `
 	}
 	sql += ` ORDER BY a.index_code ASC `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_source/icpi.go

@@ -127,7 +127,7 @@ type BaseFromIcpiIndexView struct {
 	Paging                 *paging.PagingItem      `description:"分页数据" gorm:"-"`
 }
 
-func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (items []*BaseFromIcpiIndexView, err error) {
+func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars []interface{}) (items []*BaseFromIcpiIndexView, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_icpi_index WHERE 1=1  `
 	if condition != "" {
@@ -135,7 +135,7 @@ func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (
 	}
 	sql += `ORDER BY base_from_icpi_index_id ASC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_stat/edb_info_delete_log.go

@@ -77,8 +77,8 @@ type EdbInfoDeleteLog struct {
 	EdbNameEn          string  `gorm:"column:edb_name_en;type:varchar(255);default:''"`                  // 英文指标名称
 	UnitEn             string  `gorm:"column:unit_en;type:varchar(20);default:''"`                       // 英文单位
 	ChartImage         string  `gorm:"column:chart_image;type:varchar(255);default:''"`                  // 图表图片
-	Calendar           string  `gorm:"column:calendar;type:varchar(16);default:公历"`                    // 公历/农历
-	DataDateType       string  `gorm:"column:data_date_type;type:varchar(32);default:交易日"`            // 数据日期类型，枚举值：交易日、自然日
+	Calendar           string  `gorm:"column:calendar;type:varchar(16);default:公历"`                      // 公历/农历
+	DataDateType       string  `gorm:"column:data_date_type;type:varchar(32);default:交易日"`               // 数据日期类型，枚举值：交易日、自然日
 	ManualSave         int     `gorm:"column:manual_save;type:tinyint(4);not null;default:0"`            // 是否手动保存过上下限：0-否；1-是
 	TerminalCode       string  `gorm:"column:terminal_code;type:varchar(255);default:''"`                // 终端编码，用于配置在机器上
 	CreateTime         string  `gorm:"index:create_time_idx;column:create_time;type:datetime"`           // 创建时间
@@ -157,6 +157,6 @@ func GetEdbDeleteLogCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_log.go

@@ -141,6 +141,6 @@ func GetEdbUpdateLogCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_stat.go

@@ -142,7 +142,7 @@ func GetEdbUpdateStatCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -184,6 +184,6 @@ WHERE
 	data_update_failed_reason
 	ORDER BY count(*) desc`
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -92,6 +92,6 @@ func GetEdbSourceStatCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/en_classify_permission.go

@@ -71,7 +71,7 @@ func (m *EnClassifyPermission) GetItemByCondition(condition string, pars []inter
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -79,7 +79,7 @@ func (m *EnClassifyPermission) GetCountByCondition(condition string, pars []inte
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -95,7 +95,7 @@ func (m *EnClassifyPermission) GetItemsByCondition(condition string, pars []inte
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -116,7 +116,7 @@ func (m *EnClassifyPermission) GetPageItemsByCondition(startSize, pageSize int,
 	//}
 	//sql += ` LIMIT ?,?`
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/en_permission.go

@@ -83,7 +83,7 @@ func (m *EnPermission) GetItemByCondition(condition string, pars []interface{})
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -91,7 +91,7 @@ func (m *EnPermission) GetCountByCondition(condition string, pars []interface{})
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -107,7 +107,7 @@ func (m *EnPermission) GetItemsByCondition(condition string, pars []interface{},
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -124,7 +124,7 @@ func (m *EnPermission) GetPageItemsByCondition(startSize, pageSize int, conditio
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -198,7 +198,9 @@ func GetEnPermissionUnionList(condition string, pars []interface{}) (items []*En
 			sort ASC,
 			create_time ASC`, condition, condition)
 	//_, err = o.Raw(sql, pars, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars, pars).Find(&items).Error
+	pars = append(pars, pars...)
+	//	err = global.DmSQL["rddp"].Raw(sql, pars, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/en_video_cover.go

@@ -55,7 +55,7 @@ func GetEnglishVideoCoverPageList(condition string, pars []interface{}, orderRul
 	sql += orderRule
 	totalSQL := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQL, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQL, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQL, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/english_company.go

@@ -192,7 +192,7 @@ WHERE
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -230,7 +230,7 @@ func GetEnglishCompanyList(condition string, pars []interface{}, order string) (
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/english_policy_report.go

@@ -115,7 +115,7 @@ func GetEnglishPolicyReportListCount(condition string, pars []interface{}) (coun
 		sql += condition
 	}
 	//	err = oRddp.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -143,7 +143,7 @@ func GetEnglishPolicyReportByCondition(condition string, pars []interface{}) (it
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/english_report.go

@@ -513,7 +513,7 @@ FROM
 		pars = append(pars, utils.GetLikeKeyword(keyword))
 		pars = append(pars, rootIds)
 		//_, err = o.Raw(sql, pars).QueryRows(&items)
-		err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	} else {
 		sql = `SELECT * FROM english_classify WHERE parent_id>0  ` + cond + ` and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		//_, err = o.Raw(sql, rootIds).QueryRows(&items)
@@ -562,7 +562,10 @@ func ModifyEnglishReportAuthor(condition string, pars []interface{}, authorName
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, authorName, pars).Scan(&count).Error
+	//err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...).Scan(&count).Error
+	result := global.DmSQL["rddp"].Exec(sql, utils.ForwardPars(pars, authorName)...)
+	count = int(result.RowsAffected)
+	err = result.Error
 	return
 }
 

models/english_report_email.go

@@ -134,7 +134,7 @@ WHERE a.is_deleted = 0 `
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -156,7 +156,7 @@ func GetEnglishReportEmailList(condition string, pars []interface{}, order strin
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -220,7 +220,7 @@ func GetEnglishCompanyViewPageList(condition string, pars []interface{}, order s
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -292,7 +292,7 @@ b.company_name AS company_name,a.company_name AS register_company_name FROM engl
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/english_report_email_log.go

@@ -105,7 +105,7 @@ func GetEnglishReportEmailLogPageList(condition string, pars []interface{}, orde
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -160,7 +160,7 @@ func GetEnglishReportEmailLog(condition string, pars []interface{}) (item *Engli
 	sql += condition
 	sql += ` ORDER BY id DESC LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/english_report_email_pv.go

@@ -71,7 +71,7 @@ func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, start
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`
@@ -100,7 +100,7 @@ func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, start
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`

models/english_video.go

@@ -199,7 +199,7 @@ func GetEnglishVideoListCount(condition string, pars []interface{}) (count int,
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -227,7 +227,7 @@ func GetEnglishVideoByCondition(condition string, pars []interface{}) (items []*
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/fe_calendar/fe_calendar_matter.go

@@ -184,7 +184,7 @@ func (m *FeCalendarMatter) GetItemsByCondition(condition string, pars []interfac
 	}
 	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.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/manual_edb.go

@@ -119,7 +119,7 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 	}
 
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -140,7 +140,7 @@ func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err e
 	sql += ` ORDER BY a.create_date DESC `
 
 	//err = o.Raw(sql, pars).QueryRow(&total)
-	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&total).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&total).Error
 	return
 }
 
@@ -382,7 +382,7 @@ func GetManualEdbCountByCondition(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/out_link.go

@@ -73,7 +73,7 @@ func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, ord
 	}
 	sql += 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
 }
 
@@ -96,7 +96,7 @@ func (ol *OutLink) GetCountByCondition(condition string, pars []interface{}) (co
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, ol.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -113,7 +113,7 @@ func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition st
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, ol.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/ppt_english/ppt_english.go

@@ -130,7 +130,7 @@ func GetPptEnglishByCondition(condition string, pars []interface{}) (items []*Pp
 	sql += `ORDER BY modify_time DESC`
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -141,7 +141,7 @@ func GetPptEnglishListCount(condition string, pars []interface{}) (count int, er
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/ppt_v2.go

@@ -6,7 +6,6 @@ import (
 	"eta_gn/eta_api/utils"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -171,10 +170,10 @@ func GetPptV2ById(pptId int) (item *PptV2, err error) {
 }
 
 func GetPptV2ByIds(pptIds []int) (list []*PptV2, err error) {
-	_, err = orm.NewOrmUsingDB("rddp").
-		QueryTable("ppt_v2").
-		Filter("ppt_id__in", pptIds).
-		All(&list)
+	//_, err = orm.NewOrmUsingDB("rddp").
+	//	QueryTable("ppt_v2").
+	//	Filter("ppt_id__in", pptIds).
+	//	All(&list)
 	err = global.DmSQL["rddp"].Table("ppt_v2").Where("ppt_id IN ?", pptIds).Find(&list).Error
 
 	return

models/report.go

@@ -173,7 +173,7 @@ func GetReportListCountV1(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -242,7 +242,7 @@ func GetReportListCountByGrant(condition string, pars []interface{}) (count int,
 
 	sql = `SELECT COUNT(1) AS count  FROM (` + sql + `) d`
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -279,7 +279,7 @@ func GetReportListCount(condition string, pars []interface{}) (count int, err er
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -1116,7 +1116,7 @@ func GetCommentReportTotalByReportId(condition string, pars []interface{}) (tota
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&total)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&total).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&total).Error
 	return
 }
 
@@ -1235,7 +1235,7 @@ func GetPageReportList(condition string, pars []interface{}, startSize, pageSize
 	sql += ` ORDER BY modify_time DESC`
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
 	//err = o.Raw(totalSql, pars).QueryRow(&total)
-	err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1353,7 +1353,10 @@ func ModifyReportAuthor(condition string, pars []interface{}, authorName string)
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, authorName, pars).Scan(&count).Error
+	//err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...).Scan(&count).Error
+	result := global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...)
+	count = int(result.RowsAffected)
+	err = result.Error
 	return
 }
 
@@ -1426,7 +1429,7 @@ func GetReportByCondition(condition string, pars []interface{}, fieldArr []strin
 		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	} else {
 		//_, err = o.Raw(sql, pars).QueryRows(&items)
-		err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	}
 	return
 }

models/report_approve/report_approve.go

@@ -321,7 +321,7 @@ func GetApprovingReportApproveCount(cond string, pars []interface{}) (count int,
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -351,7 +351,7 @@ func GetApprovedReportApproveCount(cond string, pars []interface{}) (count int,
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/report_approve/report_approve_flow.go

@@ -131,7 +131,7 @@ func (m *ReportApproveFlow) 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.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -155,7 +155,7 @@ func (m *ReportApproveFlow) 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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report_approve/report_approve_message.go

@@ -132,7 +132,7 @@ func (m *ReportApproveMessage) GetItemByCondition(condition string, pars []inter
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -156,7 +156,7 @@ func (m *ReportApproveMessage) GetItemsByCondition(condition string, pars []inte
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report_approve/report_approve_node.go

@@ -127,7 +127,7 @@ func (m *ReportApproveNode) 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.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *ReportApproveNode) GetCountByCondition(condition string, pars []interfa
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -151,7 +151,7 @@ func (m *ReportApproveNode) 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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report_approve/report_approve_record.go

@@ -166,7 +166,7 @@ func (m *ReportApproveRecord) GetItemByCondition(condition string, pars []interf
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -174,7 +174,7 @@ func (m *ReportApproveRecord) GetCountByCondition(condition string, pars []inter
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -190,7 +190,7 @@ func (m *ReportApproveRecord) GetItemsByCondition(condition string, pars []inter
 	}
 	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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -276,7 +276,7 @@ func (m *ReportApproveRecord) UpdateNodeState(reportApproveId, nodeId, nodeState
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE report_approve_id = ? AND node_id = ?`, m.TableName())
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, pars).Error
+	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
 

models/report_chapter.go

@@ -530,7 +530,7 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 	}
 
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, pars).Error
+	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
 
@@ -610,6 +610,6 @@ func GetCountReportChapterByCondition(condition string, pars []interface{}) (cou
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }