orm->gorm

models/edb_import_fail.go

@@ -1,35 +1,40 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_api/global"
+)
 
 type EdbImportFail struct {
-	Id           int `orm:"column(id);pk"`
-	ClassifyName string
-	Frequency    string
-	SecName      string
-	Unit         string
-	Remark       string
-	SysUserId    string
+	Id           int    `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
+	ClassifyName string `gorm:"column:classify_name"`
+	Frequency    string `gorm:"column:frequency"`
+	SecName      string `gorm:"column:sec_name"`
+	Unit         string `gorm:"column:unit"`
+	Remark       string `gorm:"column:remark"`
+	SysUserId    string `gorm:"column:sys_user_id"`
 }
 
 func AddEdbImportFail(item *EdbImportFail) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["edb"].Create(item).Error
 	return err
 }
 
 // DelEdbImportFail 删除导入失败记录
 func DelEdbImportFail(userId int) (err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `delete from edb_import_fail where sys_user_id=?`
-	_, err = o.Raw(sql, userId).Exec()
+	//_, err = o.Raw(sql, userId).Exec()
+	err = global.DmSQL["edb"].Exec(sql, userId).Error
 	return err
 }
 
 // GetEdbImportFailList 获取指标数据导入失败数据
 func GetEdbImportFailList(sysUserId int) (items []*EdbImportFail, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT * FROM edb_import_fail WHERE sys_user_id=? `
-	_, err = o.Raw(sql, sysUserId).QueryRows(&items)
+	//_, err = o.Raw(sql, sysUserId).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, sysUserId).Find(&items).Error
 	return
 }

models/edbdata_import_fail.go

@@ -1,26 +1,28 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type EdbdataImportFail struct {
-	Id           int `orm:"column(id);pk"`
-	ClassifyName string
-	CreateDate   string
-	SecName      string
-	Close        string
-	Remark       string
-	SysUserId    string
-	Frequency    string
-	Unit         string
+	Id           int    `gorm:"column:id;primaryKey;autoIncrement" description:"主键ID"`
+	ClassifyName string `gorm:"column:classify_name" description:"分类名称"`
+	CreateDate   string `gorm:"column:create_date" description:"创建日期"`
+	SecName      string `gorm:"column:sec_name" description:"部门名称"`
+	Close        string `gorm:"column:close" description:"关闭状态"`
+	Remark       string `gorm:"column:remark" description:"备注"`
+	SysUserId    string `gorm:"column:sys_user_id" description:"系统用户ID"`
+	Frequency    string `gorm:"column:frequency" description:"频率"`
+	Unit         string `gorm:"column:unit" description:"单位"`
 }
 
 func AddEdbdataImportFail(item *EdbdataImportFail) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Insert(item)
-	return err
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["edb"].Create(item).Error
+	//return err
+	return
 }
 
 // MultiAddEdbdataImportFail
@@ -30,16 +32,17 @@ func AddEdbdataImportFail(item *EdbdataImportFail) (err error) {
 // @param items []*EdbdataImportFail
 // @return err error
 func MultiAddEdbdataImportFail(items []*EdbdataImportFail) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.InsertMulti(utils.MultiAddNum, items)
-
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.InsertMulti(utils.MultiAddNum, items)
+	err = global.DmSQL["edb"].CreateInBatches(items, utils.MultiAddNum).Error
 	return err
 }
 
 // DelEdbDataImportFail 删除导入指标失败记录
 func DelEdbDataImportFail(userId int) (err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `delete from edbdata_import_fail where sys_user_id=?`
-	_, err = o.Raw(sql, userId).Exec()
+	//_, err = o.Raw(sql, userId).Exec()
+	err = global.DmSQL["edb"].Exec(sql, userId).Error
 	return err
 }

models/en_classify_permission.go

@@ -1,18 +1,18 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 type EnClassifyPermission struct {
-	EnClassifyPermissionId int       `orm:"column(en_classify_permission_id);pk" description:"英文品种权限ID"`
-	EnClassifyId           int       `description:"英文分类ID"`
-	EnPermissionId         int       `description:"英文品种ID"`
-	CreateTime             time.Time `description:"创建时间"`
+	EnClassifyPermissionId int       `gorm:"column:en_classify_permission_id;primaryKey;autoIncrement" description:"英文品种权限ID"`
+	EnClassifyId           int       `gorm:"column:en_classify_id" description:"英文分类ID"`
+	EnPermissionId         int       `gorm:"column:en_permission_id" description:"英文品种ID"`
+	CreateTime             time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
 }
 
 var EnClassifyPermissionColumns = struct {
@@ -32,53 +32,59 @@ func (m *EnClassifyPermission) TableName() string {
 }
 
 func (m *EnClassifyPermission) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EnClassifyPermissionId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EnClassifyPermissionId = int(id)
+	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
 
 func (m *EnClassifyPermission) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *EnClassifyPermission) Del() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnClassifyPermissionColumns.EnClassifyPermissionId)
-	_, err = o.Raw(sql, m.EnClassifyPermissionId).Exec()
+	//_, err = o.Raw(sql, m.EnClassifyPermissionId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, m.EnClassifyPermissionId).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetItemById(id int) (item *EnClassifyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnClassifyPermissionColumns.EnClassifyPermissionId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetItemByCondition(condition string, pars []interface{}) (item *EnClassifyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 `, m.TableName())
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//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 = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EnClassifyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -88,12 +94,13 @@ func (m *EnClassifyPermission) 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).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*EnClassifyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -104,34 +111,51 @@ func (m *EnClassifyPermission) GetPageItemsByCondition(startSize, pageSize int,
 	}
 	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 = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
+	//	return
+	//}
+	//sql += ` LIMIT ?,?`
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+
 	return
 }
 
 func ClearAndCreateEnClassifyPermissions(classifyId int, permissions []*EnClassifyPermission) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM en_classify_permission WHERE en_classify_id = ?`
-	if _, e := o.Raw(sql, classifyId).Exec(); e != nil {
+	if e := global.DmSQL["rddp"].Exec(sql, classifyId).Error; e != nil {
 		err = fmt.Errorf("delete err: %s", e.Error())
 		return
 	}
 	if len(permissions) > 0 {
-		if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
+		if e := global.DmSQL["rddp"].CreateInBatches(permissions, utils.MultiAddNum).Error; e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
 		}
 	}
+	//if _, e := o.Raw(sql, classifyId).Exec(); e != nil {
+	//	err = fmt.Errorf("delete err: %s", e.Error())
+	//	return
+	//}
+	//if len(permissions) > 0 {
+	//	if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
+	//		err = fmt.Errorf("insert multi err: %s", e.Error())
+	//		return
+	//	}
+	//}
 	return
 }
 
 func CreateEnClassifyPermissions(permissions []*EnClassifyPermission) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	if len(permissions) > 0 {
-		if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
+		if e := global.DmSQL["rddp"].CreateInBatches(permissions, utils.MultiAddNum).Error; e != nil {
+			//if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
 		}
@@ -149,30 +173,33 @@ func GetEnglishReportIdsByEnPermissionIds(permissionIds []int) (reportIds []int,
 	if len(permissionIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT id FROM english_report WHERE classify_id_second IN (
 				SELECT DISTINCT en_classify_id FROM en_classify_permission WHERE en_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `)
 			)`
-	_, err = o.Raw(sql, permissionIds).QueryRows(&reportIds)
+	//_, err = o.Raw(sql, permissionIds).QueryRows(&reportIds)
+	err = global.DmSQL["rddp"].Raw(sql, permissionIds).Find(&reportIds).Error
 	return
 }
 
 // GetEnPermissionIdsByEnglishReportId 获取英文报告权限IDs
 func GetEnPermissionIdsByEnglishReportId(reportId int) (permissionIds []int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT en_permission_id FROM en_classify_permission WHERE en_classify_id = (
 				SELECT classify_id_second FROM english_report WHERE id = ?
 			)`
-	_, err = o.Raw(sql, reportId).QueryRows(&permissionIds)
+	//_, err = o.Raw(sql, reportId).QueryRows(&permissionIds)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&permissionIds).Error
 	return
 }
 
 // GetEnPermissionIdsByEnglishVideoId 获取英文视频权限IDs
 func GetEnPermissionIdsByEnglishVideoId(videoId int) (permissionIds []int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT en_permission_id FROM en_classify_permission WHERE en_classify_id = (
 				SELECT classify_id_second FROM english_video WHERE id = ?
 			)`
-	_, err = o.Raw(sql, videoId).QueryRows(&permissionIds)
+	//_, err = o.Raw(sql, videoId).QueryRows(&permissionIds)
+	err = global.DmSQL["rddp"].Raw(sql, videoId).Find(&permissionIds).Error
 	return
 }

models/en_company_permission.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -9,10 +10,10 @@ import (
 )
 
 type EnCompanyPermission struct {
-	EnCompanyPermissionId int       `orm:"column(en_company_permission_id);pk" description:"英文品种权限ID"`
-	EnCompanyId           int       `description:"英文客户ID"`
-	EnPermissionId        int       `description:"英文品种ID"`
-	CreateTime            time.Time `description:"创建时间"`
+	EnCompanyPermissionId int       `gorm:"column:en_company_permission_id;primaryKey;autoIncrement" description:"英文公司权限ID"`
+	EnCompanyId           int       `gorm:"column:en_company_id" description:"英文客户ID"`
+	EnPermissionId        int       `gorm:"column:en_permission_id" description:"英文权限ID"`
+	CreateTime            time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
 }
 
 var EnCompanyPermissionColumns = struct {
@@ -32,53 +33,59 @@ func (m *EnCompanyPermission) TableName() string {
 }
 
 func (m *EnCompanyPermission) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EnCompanyPermissionId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EnCompanyPermissionId = int(id)
+	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
 
 func (m *EnCompanyPermission) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *EnCompanyPermission) Del() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnCompanyPermissionColumns.EnCompanyPermissionId)
-	_, err = o.Raw(sql, m.EnCompanyPermissionId).Exec()
+	//_, err = o.Raw(sql, m.EnCompanyPermissionId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, m.EnCompanyPermissionId).Error
 	return
 }
 
 func (m *EnCompanyPermission) GetItemById(id int) (item *EnCompanyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnCompanyPermissionColumns.EnCompanyPermissionId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *EnCompanyPermission) GetItemByCondition(condition string, pars []interface{}) (item *EnCompanyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 `, m.TableName())
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *EnCompanyPermission) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//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 = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *EnCompanyPermission) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EnCompanyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -88,12 +95,13 @@ func (m *EnCompanyPermission) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (m *EnCompanyPermission) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*EnCompanyPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -104,27 +112,39 @@ func (m *EnCompanyPermission) GetPageItemsByCondition(startSize, pageSize int, c
 	}
 	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 = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func ClearAndCreateEnCompanyPermissions(companyId int, permissions []*EnCompanyPermission) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM en_company_permission WHERE en_company_id = ?`
-	if _, e := o.Raw(sql, companyId).Exec(); e != nil {
+	if e := global.DmSQL["rddp"].Exec(sql, companyId).Error; e != nil {
 		err = fmt.Errorf("delete err: %s", e.Error())
 		return
 	}
 	if len(permissions) > 0 {
-		if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
+		if e := global.DmSQL["rddp"].CreateInBatches(permissions, utils.MultiAddNum).Error; e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
 		}
 	}
+	//if _, e := o.Raw(sql, companyId).Exec(); e != nil {
+	//	err = fmt.Errorf("delete err: %s", e.Error())
+	//	return
+	//}
+	//if len(permissions) > 0 {
+	//	if _, e := o.InsertMulti(len(permissions), permissions); e != nil {
+	//		err = fmt.Errorf("insert multi err: %s", e.Error())
+	//		return
+	//	}
+	//}
 	return
 }
 

models/en_permission.go

@@ -1,22 +1,22 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
 )
 
 type EnPermission struct {
-	EnPermissionId   int       `orm:"column(en_permission_id);pk" description:"英文品种权限ID"`
-	EnPermissionName string    `description:"品种权限名称"`
-	CnPermissionName string    `description:"对应的中文权限名称"`
-	ParentId         int       `description:"父级ID"`
-	Sort             int       `description:"排序"`
-	CreateTime       time.Time `description:"创建时间"`
-	ModifyTime       time.Time `description:"修改时间"`
-	Enabled          int       `description:"是否可用，1可用，0禁用"`
+	EnPermissionId   int       `gorm:"column:en_permission_id;primaryKey;autoIncrement" description:"英文权限ID"`
+	EnPermissionName string    `gorm:"column:en_permission_name" description:"英文权限名称"`
+	CnPermissionName string    `gorm:"column:cn_permission_name" description:"对应的中文权限名称"`
+	ParentId         int       `gorm:"column:parent_id" description:"父级ID"`
+	Sort             int       `gorm:"column:sort" description:"排序"`
+	CreateTime       time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
+	ModifyTime       time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	Enabled          int       `gorm:"column:enabled" description:"是否可用，1可用，0禁用"`
 }
 
 var EnPermissionColumns = struct {
@@ -44,53 +44,59 @@ func (m *EnPermission) TableName() string {
 }
 
 func (m *EnPermission) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EnPermissionId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EnPermissionId = int(id)
+	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
 
 func (m *EnPermission) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *EnPermission) Del() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnPermissionColumns.EnPermissionId)
-	_, err = o.Raw(sql, m.EnPermissionId).Exec()
+	//_, err = o.Raw(sql, m.EnPermissionId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, m.EnPermissionId).Error
 	return
 }
 
 func (m *EnPermission) GetItemById(id int) (item *EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), EnPermissionColumns.EnPermissionId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *EnPermission) GetItemByCondition(condition string, pars []interface{}) (item *EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 `, m.TableName())
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *EnPermission) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//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 = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *EnPermission) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -100,12 +106,13 @@ func (m *EnPermission) 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).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (m *EnPermission) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -116,11 +123,13 @@ 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 = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -170,7 +179,7 @@ type EnPermissionMoveReq struct {
 }
 
 func GetEnPermissionUnionList(condition string, pars []interface{}) (items []*EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`
 		SELECT
 			*
@@ -186,17 +195,19 @@ func GetEnPermissionUnionList(condition string, pars []interface{}) (items []*En
 			parent_id ASC,
 			sort ASC,
 			create_time ASC`, condition, condition)
-	_, err = o.Raw(sql, pars, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, pars).Find(&items).Error
 	return
 }
 
 func ClearEnPermissionsByPermissionId(permissionId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %s", e.Error())
-		return
-	}
+	//o := orm.NewOrmUsingDB("rddp")
+	//tx, e := o.Begin()
+	tx := global.DmSQL["rddp"].Begin()
+	//if e != nil {
+	//	err = fmt.Errorf("orm begin err: %s", e.Error())
+	//	return
+	//}
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -206,14 +217,15 @@ func ClearEnPermissionsByPermissionId(permissionId int) (err error) {
 	}()
 
 	sql := `DELETE FROM en_classify_permission WHERE en_permission_id = ?`
-	_, e = tx.Raw(sql, permissionId).Exec()
+	//_, e = tx.Raw(sql, permissionId).Exec()
+	e := tx.Exec(sql, permissionId).Error
 	if e != nil {
 		err = fmt.Errorf("delete en_classify_permission err: %s", e.Error())
 		return
 	}
 
 	sql = `DELETE FROM en_company_permission WHERE en_permission_id = ?`
-	_, e = tx.Raw(sql, permissionId).Exec()
+	e = tx.Exec(sql, permissionId).Error
 	if e != nil {
 		err = fmt.Errorf("delete en_company_permission err: %s", e.Error())
 		return
@@ -223,51 +235,57 @@ func ClearEnPermissionsByPermissionId(permissionId int) (err error) {
 
 // UpdateEnPermissionSortByParentId 根据父类id更新排序
 func UpdateEnPermissionSortByParentId(parentId, permissionId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update en_permission set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
 	if permissionId > 0 {
 		sql += ` or ( en_permission_id > ` + fmt.Sprint(permissionId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
+	//_, err = o.Raw(sql, parentId, nowSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, parentId, nowSort).Error
 	return
 }
 
 // GetMaxSortByParentId 获取最大的排序值
 func (m *EnPermission) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT max(%s) AS sort FROM %s WHERE %s = ? `, EnPermissionColumns.Sort, m.TableName(), EnPermissionColumns.ParentId)
-	err = o.Raw(sql, parentId).QueryRow(&maxSort)
+	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (m *EnPermission) GetMaxSort() (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT max(%s) AS sort FROM %s`, EnPermissionColumns.Sort, m.TableName())
-	err = o.Raw(sql).QueryRow(&maxSort)
+	//err = o.Raw(sql).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
 
 // GetFirstEnPermissionByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (m *EnPermission) GetFirstEnPermissionByParentId(parentId int) (item *EnPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? order by sort asc, en_permission_id asc limit 1`, m.TableName(), EnPermissionColumns.ParentId)
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	//err = o.Raw(sql, parentId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
 	return
 }
 
 // SetEnabled 更新启动禁用
 func (m *EnPermission) SetEnabled(parentId, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?  WHERE %s = ?`, m.TableName(), EnPermissionColumns.Enabled, EnPermissionColumns.ParentId)
-	_, err = o.Raw(sql, enabled, parentId).Exec()
+	//_, err = o.Raw(sql, enabled, parentId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, enabled, parentId).Error
 	return
 }
 
 // SetEnabledByPermissionId 更新启动禁用
 func (m *EnPermission) SetEnabledByPermissionId(permissionId, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?  WHERE %s = ?`, m.TableName(), EnPermissionColumns.Enabled, EnPermissionColumns.EnPermissionId)
-	_, err = o.Raw(sql, enabled, permissionId).Exec()
+	//_, err = o.Raw(sql, enabled, permissionId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, enabled, permissionId).Error
 	return
 }

models/en_video_cover.go

@@ -1,20 +1,20 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 // EnglishVideoCover 英文研报视频封面库
 type EnglishVideoCover struct {
-	Id         int       `orm:"column(id);pk;auto" description:"封面ID"`
-	CoverName  string    `description:"封面名称"`
-	CoverUrl   string    `description:"封面图地址"`
-	IsDeleted  int       `description:"是否已删除 0-否 1-是"`
-	CreateTime time.Time `description:"创建时间"`
-	ModifyTime time.Time `description:"修改时间"`
-	DeleteTime time.Time `description:"删除时间"`
+	Id         int       `gorm:"column:id;primaryKey;autoIncrement" description:"封面ID"`
+	CoverName  string    `gorm:"column:cover_name" description:"封面名称"`
+	CoverUrl   string    `gorm:"column:cover_url" description:"封面图地址"`
+	IsDeleted  int       `gorm:"column:is_deleted" description:"是否已删除 0-否 1-是"`
+	CreateTime time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
+	ModifyTime time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	DeleteTime time.Time `gorm:"column:delete_time" description:"删除时间"`
 }
 
 func (item *EnglishVideoCover) TableName() string {
@@ -22,28 +22,31 @@ func (item *EnglishVideoCover) TableName() string {
 }
 
 func (item *EnglishVideoCover) Add() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishVideoCover) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetEnglishVideoCoverById 主键获取封面
 func GetEnglishVideoCoverById(coverId int) (item *EnglishVideoCover, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_video_cover WHERE id = ? AND is_deleted = 0 LIMIT 1`
-	err = o.Raw(sql, coverId).QueryRow(&item)
+	//err = o.Raw(sql, coverId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, coverId).First(&item).Error
 	return
 }
 
 // GetEnglishVideoCoverPageList 获取封面库分页列表
 func GetEnglishVideoCoverPageList(condition string, pars []interface{}, orderRule string, startSize, pageSize int) (total int, list []*EnglishVideoCover, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_video_cover WHERE is_deleted = 0 `
 	sql += condition
 	if orderRule == "" {
@@ -51,23 +54,25 @@ 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 = o.Raw(totalSQL, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQL, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
 	return
 }
 
 // DeleteEnglishVideoCover 删除封面
 func DeleteEnglishVideoCover(coverId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_video_cover SET is_deleted = 1, delete_time = NOW() WHERE id = ? LIMIT 1`
-	_, err = o.Raw(sql, coverId).Exec()
+	//_, err = o.Raw(sql, coverId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, coverId).Error
 	return
 }
 
-
 type EnglishVideoCoverListResp struct {
 	Paging *paging.PagingItem
 	List   []*EnglishVideoCoverItem `description:"列表数据"`
@@ -89,4 +94,4 @@ type EnglishVideoCoverSaveReq struct {
 
 type EnglishVideoCoverOptionReq struct {
 	Id int `description:"封面图ID"`
-}
+}

models/english_classify.go

@@ -1,42 +1,46 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // UpdateEnglishClassifySortByParentId 根据父类id更新排序
 func UpdateEnglishClassifySortByParentId(parentId, permissionId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update english_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
 	if permissionId > 0 {
 		sql += ` or ( id > ` + fmt.Sprint(permissionId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
+	//_, err = o.Raw(sql, parentId, nowSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, parentId, nowSort).Error
 	return
 }
 
 // GetMaxSortByParentId 获取最大的排序值
 func (classifyInfo *EnglishClassify) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT max(sort) AS sort FROM english_classify WHERE parent_id = ? `
-	err = o.Raw(sql, parentId).QueryRow(&maxSort)
+	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (classifyInfo *EnglishClassify) GetMaxSort() (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT max(sort) AS sort FROM english_classify`
-	err = o.Raw(sql).QueryRow(&maxSort)
+	//err = o.Raw(sql).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
 
 // GetFirstClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (classifyInfo *EnglishClassify) GetFirstClassifyByParentId(parentId int) (item *Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_classify WHERE parent_id = ? order by sort asc, id asc limit 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	//err = o.Raw(sql, parentId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
 	return
 }
 

models/english_company.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -14,18 +14,18 @@ const (
 
 // EnglishCompany 英文客户
 type EnglishCompany struct {
-	CompanyId   int       `orm:"column(company_id);pk" description:"英文客户ID"`
-	CompanyName string    `description:"客户名称"`
-	CountryCode string    `description:"国家Code"`
-	Country     string    `description:"国家"`
-	SellerId    int       `description:"销售ID"`
-	SellerName  string    `description:"销售姓名"`
-	ViewTotal   int       `description:"累计点击量/阅读量"`
-	IsDeleted   int       `description:"删除状态：0-正常；1-已删除"`
-	CreateTime  time.Time `description:"创建时间"`
-	ModifyTime  time.Time `description:"更新时间"`
-	Enabled     int       `description:"0-禁用; 1-启用; 2-部分禁用"`
-	Status      int       `description:"1:正式,2:临时,3:终止"`
+	CompanyId   int       `gorm:"column:company_id;primary_key:true" description:"英文客户ID"`
+	CompanyName string    `gorm:"column:company_name" description:"客户名称"`
+	CountryCode string    `gorm:"column:country_code" description:"国家Code"`
+	Country     string    `gorm:"column:country" description:"国家"`
+	SellerId    int       `gorm:"column:seller_id" description:"销售ID"`
+	SellerName  string    `gorm:"column:seller_name" description:"销售姓名"`
+	ViewTotal   int       `gorm:"column:view_total" description:"累计点击量/阅读量"`
+	IsDeleted   int       `gorm:"column:is_deleted" description:"删除状态：0-正常；1-已删除"`
+	CreateTime  time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime  time.Time `gorm:"column:modify_time" description:"更新时间"`
+	Enabled     int       `gorm:"column:enabled" description:"0-禁用; 1-启用; 2-部分禁用"`
+	Status      int       `gorm:"column:status" description:"1:正式,2:临时,3:终止"`
 }
 
 type EnglishCompanyListItem struct {
@@ -40,12 +40,13 @@ func (item *EnglishCompany) TableName() string {
 }
 
 func (item *EnglishCompany) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.CompanyId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.CompanyId = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
@@ -60,24 +61,27 @@ type EnglishCompanySaveReq struct {
 }
 
 func (item *EnglishCompany) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetEnglishCompanyById 主键获取客户
 func GetEnglishCompanyById(id int) (item *EnglishCompany, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_company WHERE is_deleted = 0 AND company_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetEnglishCompanyByName 名称获取客户
 func GetEnglishCompanyByName(companyName string) (item *EnglishCompany, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_company WHERE is_deleted = 0 AND company_name = ? LIMIT 1`
-	err = o.Raw(sql, companyName).QueryRow(&item)
+	//err = o.Raw(sql, companyName).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, companyName).First(&item).Error
 	return
 }
 
@@ -88,8 +92,9 @@ type EnglishCompanyDelReq struct {
 
 // DeleteEnglishCompanyAndEmails 删除英文客户及联系人
 func DeleteEnglishCompanyAndEmails(companyId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	tx, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//tx, err := o.Begin()
+	tx := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -103,14 +108,16 @@ func DeleteEnglishCompanyAndEmails(companyId int) (err error) {
 
 	// 删除客户
 	sql := `UPDATE english_company SET is_deleted = 1,modify_time = NOW() WHERE company_id = ? LIMIT 1`
-	_, err = tx.Raw(sql, companyId).Exec()
+	//_, err = tx.Raw(sql, companyId).Exec()
+	err = tx.Exec(sql, companyId).Error
 	if err != nil {
 		return
 	}
 
 	// 删除联系人
 	sql = `UPDATE english_report_email SET is_deleted = 1,modify_time = NOW() WHERE company_id = ?`
-	_, err = tx.Raw(sql, companyId).Exec()
+	//_, err = tx.Raw(sql, companyId).Exec()
+	err = tx.Exec(sql, companyId).Error
 	return
 }
 
@@ -149,7 +156,7 @@ type EnglishCompanyListTodo struct {
 
 // GetEnglishCompanyPageList 获取客户列表-分页
 func GetEnglishCompanyPageList(condition string, pars []interface{}, order string, startSize, pageSize int) (total int, list []*EnglishCompanyListItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 	c.*,
 IF
@@ -187,11 +194,13 @@ WHERE
 		sql += ` ORDER BY c.create_time DESC, c.company_id DESC`
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
 	return
 }
 
@@ -212,7 +221,7 @@ type EnglishCompanyViewResp struct {
 
 // GetEnglishCompanyList 获取英文客户列表
 func GetEnglishCompanyList(condition string, pars []interface{}, order string) (list []*EnglishCompany, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_company WHERE is_deleted = 0 `
 	sql += condition
 	if order != "" {
@@ -220,7 +229,8 @@ func GetEnglishCompanyList(condition string, pars []interface{}, order string) (
 	} else {
 		sql += ` ORDER BY create_time DESC`
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
 	return
 }
 

models/english_company_log.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -15,12 +15,12 @@ const (
 
 // EnglishCompanyLog 英文客户操作日志表
 type EnglishCompanyLog struct {
-	Id         int       `orm:"column(id);pk"`
-	CompanyId  int       `description:"英文客户ID"`
-	AdminId    int       `description:"操作人ID"`
-	OptionData string    `description:"操作数据-JSON"`
-	OptionType int       `description:"操作类型：1-新增；2-编辑；3-删除"`
-	CreateTime time.Time `description:"创建时间"`
+	Id         int       `gorm:"column:id;primary_key:true" description:"日志ID"`
+	CompanyId  int       `gorm:"column:company_id" description:"英文客户ID"`
+	AdminId    int       `gorm:"column:admin_id" description:"操作人ID"`
+	OptionData string    `gorm:"column:option_data" description:"操作数据-JSON"`
+	OptionType int       `gorm:"column:option_type" description:"操作类型：1-新增；2-编辑；3-删除"`
+	CreateTime time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 func (item *EnglishCompanyLog) TableName() string {
@@ -28,17 +28,19 @@ func (item *EnglishCompanyLog) TableName() string {
 }
 
 func (item *EnglishCompanyLog) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishCompanyLog) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }

models/english_company_todo.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -17,24 +17,24 @@ const (
 
 // EnglishCompanyTodo 英文客户TODO任务
 type EnglishCompanyTodo struct {
-	Id                 int       `orm:"column(id);pk"`
-	CompanyId          int       `description:"客户id"`
-	Content            string    `description:"任务描述"`
-	SellerId           int       `description:"客户所属销售id"`
-	SellerName         string    `description:"客户所属销售名称"`
-	CreateUserId       int       `description:"创建人用户id"`
-	CreateUserName     string    `description:"创建人用户姓名"`
-	ApproveUserId      int       `description:"审批人用户id"`
-	ApproveUserName    string    `description:"审批人用户姓名"`
-	ApprovedSellerId   int       `description:"审批时，客户所属销售id"`
-	ApprovedSellerName string    `description:"审批时，客户所属销售名称"`
-	Status             string    `description:"任务状态: 枚举值：进行中,已完成,已作废"`
-	ModifyTime         time.Time `description:"修改时间"`
-	ApproveTime        time.Time `description:"审核时间"`
-	CreateTime         time.Time `description:"创建时间"`
-	EndTime            time.Time `description:"截止时间"`
-	IsDelete           int       `json:"-" description:"是否已经删除，0：未删除，1：已删除；默认：0"`
-	Remark             string    `description:"审批备注"`
+	Id                 int       `gorm:"column:id;primary_key:true" description:"任务ID"`
+	CompanyId          int       `gorm:"column:company_id" description:"客户ID"`
+	Content            string    `gorm:"column:content" description:"任务描述"`
+	SellerId           int       `gorm:"column:seller_id" description:"客户所属销售ID"`
+	SellerName         string    `gorm:"column:seller_name" description:"客户所属销售名称"`
+	CreateUserId       int       `gorm:"column:create_user_id" description:"创建人用户ID"`
+	CreateUserName     string    `gorm:"column:create_user_name" description:"创建人用户姓名"`
+	ApproveUserId      int       `gorm:"column:approve_user_id" description:"审批人用户ID"`
+	ApproveUserName    string    `gorm:"column:approve_user_name" description:"审批人用户姓名"`
+	ApprovedSellerId   int       `gorm:"column:approved_seller_id" description:"审批时，客户所属销售ID"`
+	ApprovedSellerName string    `gorm:"column:approved_seller_name" description:"审批时，客户所属销售名称"`
+	Status             string    `gorm:"column:status" description:"任务状态: 枚举值：进行中,已完成,已作废"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	ApproveTime        time.Time `gorm:"column:approve_time" description:"审核时间"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	EndTime            time.Time `gorm:"column:end_time" description:"截止时间"`
+	IsDelete           int       `gorm:"column:is_delete" json:"-" description:"是否已经删除，0：未删除，1：已删除；默认：0"`
+	Remark             string    `gorm:"column:remark" description:"审批备注"`
 }
 
 // EnglishCompanyTodoResp 英文客户TODO响应体
@@ -57,18 +57,20 @@ type EnglishCompanyTodoResp struct {
 }
 
 func (item *EnglishCompanyTodo) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.CompanyId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.CompanyId = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishCompanyTodo) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
@@ -95,17 +97,19 @@ type EnglishCompanyTodoApproveReq struct {
 
 // GetEnglishCompanyTodoById 根据任务ID获取客户任务
 func GetEnglishCompanyTodoById(id int) (item *EnglishCompanyTodo, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_company_todo WHERE id = ? LIMIT 1 `
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetCountDoingEnglishCompanyTodo 获取正在进行中的任务数量
 func GetCountDoingEnglishCompanyTodo(companyId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT count(1) AS total FROM english_company_todo WHERE status = "进行中" AND company_id = ? AND is_delete = 0 `
-	err = o.Raw(sql, companyId).QueryRow(&total)
+	//err = o.Raw(sql, companyId).QueryRow(&total)
+	err = global.DmSQL["rddp"].Raw(sql, companyId).Scan(&total).Error
 	return
 }
 
@@ -117,7 +121,7 @@ type GetEnglishCompanyTodoPageListResp struct {
 
 // GetEnglishCompanyTodoList 获取客户任务列表
 func GetEnglishCompanyTodoList(companyId, startSize, pageSize int, order string) (total int, items []*EnglishCompanyTodo, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				a.*
 			FROM
@@ -126,7 +130,8 @@ func GetEnglishCompanyTodoList(companyId, startSize, pageSize int, order string)
 			WHERE
 				a.company_id = ? AND a.status != "已作废" AND a.is_delete = 0 `
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, companyId).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, companyId).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, companyId).Scan(&total).Error; err != nil {
 		return
 	}
 	if order != `` {
@@ -135,13 +140,14 @@ func GetEnglishCompanyTodoList(companyId, startSize, pageSize int, order string)
 		sql += ` ORDER BY a.create_time DESC`
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, companyId, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, companyId, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, companyId, startSize, pageSize).Find(&items).Error
 	return
 }
 
 // GetDoingEnglishCompanyTodoList 获取客户的进行中任务列表
 func GetDoingEnglishCompanyTodoList(companyId int) (items []*EnglishCompanyTodo, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				a.*
 			FROM
@@ -151,7 +157,8 @@ func GetDoingEnglishCompanyTodoList(companyId int) (items []*EnglishCompanyTodo,
 				a.company_id = ? AND a.status = "进行中" AND a.is_delete = 0
 			ORDER BY
 				a.create_time ASC`
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
+	//_, err = o.Raw(sql, companyId).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, companyId).Find(&items).Error
 	return
 }
 
@@ -161,7 +168,7 @@ func GetEnglishCompanyLatestTodoByCompanyIds(companyIds []int) (items []*English
 	if itemsLen == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT b.* FROM 
 			(
 				SELECT
@@ -175,7 +182,8 @@ func GetEnglishCompanyLatestTodoByCompanyIds(companyIds []int) (items []*English
 					company_id
 			) AS a
 			LEFT JOIN english_company_todo AS b ON b.company_id = a.company_id AND b.create_time = a.ct `
-	_, err = o.Raw(sql, companyIds).QueryRows(&items)
+	//_, err = o.Raw(sql, companyIds).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, companyIds).Find(&items).Error
 	return
 }
 
@@ -226,7 +234,7 @@ type GetEnglishCompanyTodoDoingPageListResp struct {
 
 // GetEnglishCompanyTodoDoingList 获取客户任务未完成列表
 func GetEnglishCompanyTodoDoingList(startSize, pageSize int, order string) (total int, items []*EnglishCompanyTodoDoing, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				a.*,
 				b.company_name
@@ -236,7 +244,8 @@ func GetEnglishCompanyTodoDoingList(startSize, pageSize int, order string) (tota
 			WHERE
 				a.status = "进行中" AND a.is_delete = 0 `
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl).Scan(&total).Error; err != nil {
 		return
 	}
 	if order != `` {
@@ -245,14 +254,16 @@ func GetEnglishCompanyTodoDoingList(startSize, pageSize int, order string) (tota
 		sql += ` ORDER BY a.end_time ASC`
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
 
 // DeleteEnglishCompanyTodoByCompanyId (软)删除英文客户TODO
 func DeleteEnglishCompanyTodoByCompanyId(companyId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_company_todo SET is_delete = 1 WHERE company_id = ?`
-	_, err = o.Raw(sql, companyId).Exec()
+	//_, err = o.Raw(sql, companyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, companyId).Error
 	return
 }

models/english_company_todo_public.go

@@ -1,19 +1,20 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
 // EnglishCompanyTodoPublic 英文客户公共TODO任务
+
 type EnglishCompanyTodoPublic struct {
-	Id             int       `orm:"column(id);pk"`
-	Content        string    `description:"任务描述"`
-	CreateUserId   int       `description:"创建人用户id"`
-	CreateUserName string    `description:"创建人用户姓名"`
-	ModifyTime     time.Time `description:"修改时间"`
-	CreateTime     time.Time `description:"创建时间"`
-	IsDelete       int       `json:"-" description:"是否已经删除，0：未删除，1：已删除；默认：0"`
+	Id             int       `gorm:"column:id;primary_key:true" description:"任务ID"`
+	Content        string    `gorm:"column:content" description:"任务描述"`
+	CreateUserId   int       `gorm:"column:create_user_id" description:"创建人用户ID"`
+	CreateUserName string    `gorm:"column:create_user_name" description:"创建人用户姓名"`
+	ModifyTime     time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime     time.Time `gorm:"column:create_time" description:"创建时间"`
+	IsDelete       int       `gorm:"column:is_delete;default:0" json:"-" description:"是否已经删除，0：未删除，1：已删除；默认：0"`
 }
 
 func (item *EnglishCompanyTodoPublic) TableName() string {
@@ -30,18 +31,20 @@ type EnglishCompanyTodoPublicResp struct {
 }
 
 func (item *EnglishCompanyTodoPublic) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishCompanyTodoPublic) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
@@ -52,8 +55,9 @@ type EnglishCompanyTodoPublicAddReq struct {
 
 // GetLastEnglishCompanyTodoPublic 获取最新的公共任务TODO
 func GetLastEnglishCompanyTodoPublic() (item *EnglishCompanyTodoPublic, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_company_todo_public ORDER BY create_time DESC LIMIT 1`
-	err = o.Raw(sql).QueryRow(&item)
+	//err = o.Raw(sql).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql).First(&item).Error
 	return
 }

models/english_policy_report.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
@@ -10,33 +10,34 @@ import (
 
 // 英文策略报告
 type EnglishPolicyReport struct {
-	Id                 int       `orm:"column(id);pk;auto" description:"策略报告Id"`
-	ClassifyIdFirst    int       `description:"一级分类id"`
-	ClassifyNameFirst  string    `description:"一级分类名称"`
-	ClassifyIdSecond   int       `description:"二级分类id"`
-	ClassifyNameSecond string    `description:"二级分类名称"`
-	Title              string    `description:"标题"`
-	Abstract           string    `description:"摘要"`
-	Author             string    `description:"作者"`
-	Frequency          string    `description:"频度"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	State              int       `description:"1:未同步，2:已同步"`
-	SyncTime           time.Time `description:"同步时间"`
-	PublishStatus      int       `description:"1:未发布，2:已发布"`
-	PublishTime        time.Time `description:"发布时间"`
-	Content            string    `description:"内容"`
-	KeyTakeaways       string    `description:"关键点"`
-	AuthorMobile       string    `description:"创建者手机号"`
-	SyncReportId       int       `description:"同步后的report_id为english_report的ID"`
-	SourceReportId     int       `description:"原始报告ID"`
-	ReportCoverUrl     string    `description:"原始报告封面图"`
+	Id                 int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"策略报告ID"`
+	ClassifyIdFirst    int       `gorm:"column:classify_id_first" description:"一级分类ID"`
+	ClassifyNameFirst  string    `gorm:"column:classify_name_first" description:"一级分类名称"`
+	ClassifyIdSecond   int       `gorm:"column:classify_id_second" description:"二级分类ID"`
+	ClassifyNameSecond string    `gorm:"column:classify_name_second" description:"二级分类名称"`
+	Title              string    `gorm:"column:title" description:"标题"`
+	Abstract           string    `gorm:"column:abstract" description:"摘要"`
+	Author             string    `gorm:"column:author" description:"作者"`
+	Frequency          string    `gorm:"column:frequency" description:"频度"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	State              int       `gorm:"column:state" description:"1:未同步，2:已同步"`
+	SyncTime           time.Time `gorm:"column:sync_time" description:"同步时间"`
+	PublishStatus      int       `gorm:"column:publish_status" description:"1:未发布，2:已发布"`
+	PublishTime        time.Time `gorm:"column:publish_time" description:"发布时间"`
+	Content            string    `gorm:"column:content" description:"内容"`
+	KeyTakeaways       string    `gorm:"column:key_takeaways" description:"关键点"`
+	AuthorMobile       string    `gorm:"column:author_mobile" description:"创建者手机号"`
+	SyncReportId       int       `gorm:"column:sync_report_id" description:"同步后的report_id为english_report的ID"`
+	SourceReportId     int       `gorm:"column:source_report_id" description:"原始报告ID"`
+	ReportCoverUrl     string    `gorm:"column:report_cover_url" description:"原始报告封面图"`
 }
 
 // AddEnglishPolicyReportMulti 批量新增report
 func AddEnglishPolicyReportMulti(list []*EnglishPolicyReport) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(len(list), list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(len(list), list)
+	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
@@ -64,16 +65,18 @@ type EnglishPolicyReportDetail struct {
 }
 
 func GetEnglishPolicyReportById(reportId int) (item *EnglishPolicyReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_policy_report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 func GetEnglishPolicyReportBySourceReportId(sourceReportId int) (item *EnglishPolicyReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_policy_report WHERE source_report_id = ? LIMIT 1`
-	err = o.Raw(sql, sourceReportId).QueryRow(&item)
+	//err = o.Raw(sql, sourceReportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, sourceReportId).First(&item).Error
 	return
 }
 
@@ -106,17 +109,18 @@ type EnglishPolicyReportListResp struct {
 }
 
 func GetEnglishPolicyReportListCount(condition string, pars []interface{}) (count int, err error) {
-	oRddp := orm.NewOrmUsingDB("rddp")
+	//	oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM english_policy_report WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = oRddp.Raw(sql, pars).QueryRow(&count)
+	//	err = oRddp.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func GetEnglishPolicyReportList(condition string, pars []interface{}, startSize, pageSize int) (items []*EnglishPolicyReportList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	//产品权限
 	sql := `SELECT * 
         FROM english_policy_report WHERE 1=1  `
@@ -124,18 +128,20 @@ func GetEnglishPolicyReportList(condition string, pars []interface{}, startSize,
 		sql += condition
 	}
 	sql += `ORDER BY  publish_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetEnglishPolicyReportByCondition(condition string, pars []interface{}) (items []*EnglishPolicyReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * 
         FROM english_policy_report WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -149,40 +155,45 @@ type PullEnglishPolicyDataResp struct {
 
 // 同步报告
 func SyncEnglishPolicyReportById(id, newReportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_policy_report SET state=2, sync_time=now(),modify_time=NOW(), sync_report_id=? WHERE id = ? `
-	_, err = o.Raw(sql, newReportId, id).Exec()
+	//_, err = o.Raw(sql, newReportId, id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, newReportId, id).Error
 	return
 }
 
 // 设置策略报告内容
 func SetEnglishPolicyReportContentBySourceReportId(sourceReportId int, content string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_policy_report SET content=?, modify_time=NOW() WHERE source_report_id = ? `
-	_, err = o.Raw(sql, content, sourceReportId).Exec()
+	//_, err = o.Raw(sql, content, sourceReportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, content, sourceReportId).Error
 	return
 }
 
 // 取消发布报告
 func SyncCancelEnglishPolicyReport(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE english_policy_report SET state=1,sync_time=null,modify_time=NOW(), sync_report_id=0 WHERE id =?  `
-	_, err = o.Raw(sql, reportId).Exec()
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
 
 // 删除报告
 func DeleteEnglishPolicyReport(reportIds int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM english_policy_report WHERE id =? `
-	_, err = o.Raw(sql, reportIds).Exec()
+	//_, err = o.Raw(sql, reportIds).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportIds).Error
 	return
 }
 
 // Update 更新
 func (item *EnglishPolicyReport) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
@@ -196,8 +207,9 @@ func GetEnglishPolicyReportByIds(reportIds []int, fieldArr []string) (list []*En
 	if len(fieldArr) > 0 {
 		fields = strings.Join(fieldArr, ",")
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT ` + fields + ` FROM english_policy_report WHERE id IN (` + utils.GetOrmInReplace(listLen) + `)`
-	_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }

models/english_report.go

@@ -2,91 +2,98 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type EnglishReport struct {
-	Id                 int       `orm:"column(id)" description:"报告Id"`
-	AddType            int       `description:"新增方式：1:新增报告，2:继承报告"`
-	ClassifyIdFirst    int       `description:"一级分类id"`
-	ClassifyNameFirst  string    `description:"一级分类名称"`
-	ClassifyIdSecond   int       `description:"二级分类id"`
-	ClassifyNameSecond string    `description:"二级分类名称"`
-	Title              string    `description:"标题"`
-	Abstract           string    `description:"摘要"`
-	Author             string    `description:"作者"`
-	Frequency          string    `description:"频度"`
-	CreateTime         string    `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	State              int       `description:"1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过"`
-	PublishTime        time.Time `description:"发布时间"`
-	PrePublishTime     time.Time `description:"预发布时间"`
-	Stage              int       `description:"期数"`
-	Content            string    `description:"内容"`
-	VideoUrl           string    `description:"音频文件URL"`
-	VideoName          string    `description:"音频文件名称"`
-	VideoPlaySeconds   string    `description:"音频播放时长"`
-	VideoSize          string    `description:"音频文件大小，单位M"`
-	ContentSub         string    `description:"内容前两个章节"`
-	ReportCode         string    `description:"报告唯一编码"`
-	Pv                 int       `description:"Pv"`
-	PvEmail            int       `description:"邮箱PV"`
-	UvEmail            int       `description:"邮箱UV"`
-	EmailState         int       `description:"群发邮件状态: 0-未发送; 1-已发送"`
-	Overview           string    `description:"英文概述部分"`
-	KeyTakeaways       string    `description:"关键点"`
-	FromReportId       int       `description:"继承的报告ID（英文策略报告ID）"`
-	AdminId            int       `description:"创建者账号"`
-	AdminRealName      string    `description:"创建者姓名"`
-	ApproveTime        time.Time `description:"审批时间"`
-	ApproveId          int       `description:"审批ID"`
-	DetailImgUrl       string    `description:"报告详情长图地址"`
-	DetailPdfUrl       string    `description:"报告详情PDF地址"`
-	EmailHasFail       int       `description:"是否存在邮件发送失败的记录: 0-否; 1-是"`
+	Id                 int       `gorm:"column:id;primaryKey;autoIncrement" description:"报告Id"`
+	AddType            int       `gorm:"column:add_type" description:"新增方式：1:新增报告，2:继承报告"`
+	ClassifyIdFirst    int       `gorm:"column:classify_id_first" description:"一级分类id"`
+	ClassifyNameFirst  string    `gorm:"column:classify_name_first" description:"一级分类名称"`
+	ClassifyIdSecond   int       `gorm:"column:classify_id_second" description:"二级分类id"`
+	ClassifyNameSecond string    `gorm:"column:classify_name_second" description:"二级分类名称"`
+	Title              string    `gorm:"column:title" description:"标题"`
+	Abstract           string    `gorm:"column:abstract" description:"摘要"`
+	Author             string    `gorm:"column:author" description:"作者"`
+	Frequency          string    `gorm:"column:frequency" description:"频度"`
+	CreateTime         string    `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	State              int       `gorm:"column:state" description:"1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过"`
+	PublishTime        time.Time `gorm:"column:publish_time" description:"发布时间"`
+	PrePublishTime     time.Time `gorm:"column:pre_publish_time" description:"预发布时间"`
+	Stage              int       `gorm:"column:stage" description:"期数"`
+	Content            string    `gorm:"column:content" description:"内容"`
+	VideoUrl           string    `gorm:"column:video_url" description:"音频文件URL"`
+	VideoName          string    `gorm:"column:video_name" description:"音频文件名称"`
+	VideoPlaySeconds   string    `gorm:"column:video_play_seconds" description:"音频播放时长"`
+	VideoSize          string    `gorm:"column:video_size" description:"音频文件大小，单位M"`
+	ContentSub         string    `gorm:"column:content_sub" description:"内容前两个章节"`
+	ReportCode         string    `gorm:"column:report_code" description:"报告唯一编码"`
+	Pv                 int       `gorm:"column:pv" description:"Pv"`
+	PvEmail            int       `gorm:"column:pv_email" description:"邮箱PV"`
+	UvEmail            int       `gorm:"column:uv_email" description:"邮箱UV"`
+	EmailState         int       `gorm:"column:email_state" description:"群发邮件状态: 0-未发送; 1-已发送"`
+	Overview           string    `gorm:"column:overview" description:"英文概述部分"`
+	KeyTakeaways       string    `gorm:"column:key_takeaways" description:"关键点"`
+	FromReportId       int       `gorm:"column:from_report_id" description:"继承的报告ID（英文策略报告ID）"`
+	AdminId            int       `gorm:"column:admin_id" description:"创建者账号"`
+	AdminRealName      string    `gorm:"column:admin_real_name" description:"创建者姓名"`
+	ApproveTime        time.Time `gorm:"column:approve_time" description:"审批时间"`
+	ApproveId          int       `gorm:"column:approve_id" description:"审批ID"`
+	DetailImgUrl       string    `gorm:"column:detail_img_url" description:"报告详情长图地址"`
+	DetailPdfUrl       string    `gorm:"column:detail_pdf_url" description:"报告详情PDF地址"`
+	EmailHasFail       int       `gorm:"column:email_has_fail" description:"是否存在邮件发送失败的记录: 0-否; 1-是"`
 }
 
 func GetEnglishReportStage(classifyIdFirst, classifyIdSecond int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
 		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_second=? "
-		o.Raw(sql, classifyIdSecond).QueryRow(&count)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond).Scan(&count).Error
+		//o.Raw(sql, classifyIdSecond).QueryRow(&count)
 	} else {
 		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_first=? "
-		o.Raw(sql, classifyIdFirst).QueryRow(&count)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst).Scan(&count).Error
+		//o.Raw(sql, classifyIdFirst).QueryRow(&count)
 	}
 	return
 }
 
 func GetEnglishReportStageEdit(classifyIdFirst, classifyIdSecond, reportId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
 		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_second=? AND id<>? "
-		o.Raw(sql, classifyIdSecond, reportId).QueryRow(&count)
+		//o.Raw(sql, classifyIdSecond, reportId).QueryRow(&count)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond, reportId).Scan(&count).Error
 	} else {
 		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_first=? AND id<>? "
-		o.Raw(sql, classifyIdFirst, reportId).QueryRow(&count)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst, reportId).Scan(&count).Error
+		//o.Raw(sql, classifyIdFirst, reportId).QueryRow(&count)
 	}
 	return
 }
 
 func AddEnglishReport(item *EnglishReport) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//lastId, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
+	lastId = int64(item.Id)
 	return
 }
 
 func ModifyEnglishReportCode(reportId int64, reportCode string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET report_code=? WHERE id=? `
-	_, err = o.Raw(sql, reportCode, reportId).Exec()
+	//_, err = o.Raw(sql, reportCode, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportCode, reportId).Error
 	return
 }
 
@@ -166,7 +173,7 @@ type ElasticEnglishReportDetail struct {
 }
 
 func EditEnglishReport(item *EnglishReport, reportId int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report
 			SET
 			  classify_id_first =?,
@@ -185,8 +192,10 @@ func EditEnglishReport(item *EnglishReport, reportId int64) (err error) {
 			  modify_time = ?,
 			  overview = ?
 			WHERE id = ? `
-	_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
-		item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), item.Overview, reportId).Exec()
+	//_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
+	//	item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), item.Overview, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
+		item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), item.Overview, reportId).Error
 	return
 }
 
@@ -223,16 +232,18 @@ type EnglishReportDetail struct {
 }
 
 func GetEnglishReportById(reportId int) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 func GetEnglishReportItemById(reportId int) (item *EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report WHERE id = ? LIMIT 1`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
@@ -293,17 +304,18 @@ func GetEnglishReportListCount(condition string, pars []interface{}, companyType
 		companyTypeSqlStr = " AND classify_id_first = 40 "
 	}
 
-	oRddp := orm.NewOrmUsingDB("rddp")
+	//	oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM english_report WHERE 1=1 ` + companyTypeSqlStr
 	if condition != "" {
 		sql += condition
 	}
-	err = oRddp.Raw(sql, pars).QueryRow(&count)
+	//err = oRddp.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func GetEnglishReportList(condition string, pars []interface{}, companyType string, startSize, pageSize int, fieldArr []string) (items []*EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	//产品权限
 	companyTypeSqlStr := ``
 	if companyType == "ficc" {
@@ -323,61 +335,68 @@ func GetEnglishReportList(condition string, pars []interface{}, companyType stri
 	}
 	// 排序：1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过
 	sql += ` ORDER BY FIELD(state,3,1,4,5,6,2), modify_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetEnglishReportByCondition(condition string, pars []interface{}) (items []*EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * 
         FROM english_report WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func GetEnglishReportCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT count(*) 
         FROM english_report WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 // PublishEnglishReportById 发布报告
 func PublishEnglishReportById(reportId int, publishTime string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET state=2,publish_time=?,pre_publish_time=null,modify_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	//_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
 	return
 }
 
 // ResetEnglishReportById 重置报告状态
 func ResetEnglishReportById(reportId, state int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET state = ?, pre_publish_time = null, modify_time = NOW() WHERE id = ?`
-	_, err = o.Raw(sql, state, reportId).Exec()
+	//_, err = o.Raw(sql, state, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, state, reportId).Error
 	return
 }
 
 // PublishCancelEnglishReport 取消发布报告
 func PublishCancelEnglishReport(reportIds, state int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE english_report SET state=?, pre_publish_time=null WHERE id =?  `
-	_, err = o.Raw(sql, state, reportIds).Exec()
+	//	_, err = o.Raw(sql, state, reportIds).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, state, reportIds).Error
 	return
 }
 
 // SetPrePublishEnglishReportById 设置定时发布
 func SetPrePublishEnglishReportById(reportId int, prePublishTime string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET pre_publish_time=? WHERE id = ? and state = 1 `
-	_, err = o.Raw(sql, prePublishTime, reportId).Exec()
+	//	_, err = o.Raw(sql, prePublishTime, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, prePublishTime, reportId).Error
 	return
 }
 
@@ -399,23 +418,26 @@ func DeleteEnglishReportAndChapter(reportInfo *EnglishReportDetail) (err error)
 
 // 删除报告
 func DeleteEnglishReport(reportIds int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM english_report WHERE id =? `
-	_, err = o.Raw(sql, reportIds).Exec()
+	//	_, err = o.Raw(sql, reportIds).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportIds).Error
 	return
 }
 
 func EditEnglishReportContent(reportId int, content, contentSub string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE english_report SET content=?,content_sub=?,modify_time=NOW() WHERE id=? `
-	_, err = o.Raw(sql, content, contentSub, reportId).Exec()
+	//_, err = o.Raw(sql, content, contentSub, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, content, contentSub, reportId).Error
 	return
 }
 
 func AddEnglishReportSaveLog(reportId, adminId int, content, contentSub, adminName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` INSERT INTO english_report_save_log(report_id, content,content_sub,admin_id,admin_name) VALUES (?,?,?,?,?) `
-	_, err = o.Raw(sql, reportId, content, contentSub, adminId, adminName).Exec()
+	//_, err = o.Raw(sql, reportId, content, contentSub, adminId, adminName).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportId, content, contentSub, adminId, adminName).Error
 	return
 }
 
@@ -443,7 +465,7 @@ type EnglishClassifyListResp struct {
 // GetEnglishClassifyRootId 获取一级分类列表
 func GetEnglishClassifyRootId(keyword string, enabled int) (items []*EnglishClassifyList, err error) {
 	sql := ``
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	cond := ""
 	if enabled == 1 {
 		cond = " AND enabled=1 "
@@ -458,10 +480,12 @@ func GetEnglishClassifyRootId(keyword string, enabled int) (items []*EnglishClas
                    WHERE parent_id>0 ` + cond + ` AND classify_name LIKE ? )
                    )AS t
                    ORDER BY sort ASC,create_time ASC`
-		_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&items)
+		//	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&items)
+		err = global.DmSQL["rddp"].Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).Find(&items).Error
 	} else {
 		sql = `SELECT * FROM english_classify WHERE parent_id=0 ` + cond + ` ORDER BY sort ASC,create_time ASC `
-		_, err = o.Raw(sql).QueryRows(&items)
+		//_, err = o.Raw(sql).QueryRows(&items)
+		err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	}
 	return
 }
@@ -470,7 +494,7 @@ func GetEnglishClassifyListByRootId(rootIds []int, keyword string, enabled int)
 	sql := ``
 	pars := make([]interface{}, 0)
 
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	cond := ""
 	if enabled == 1 {
 		cond = " AND enabled=1 "
@@ -485,76 +509,85 @@ FROM
 	WHERE a.parent_id>0  ` + cond + ` and a.classify_name LIKE ? and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
 		pars = append(pars, utils.GetLikeKeyword(keyword))
 		pars = append(pars, rootIds)
-		_, err = o.Raw(sql, pars).QueryRows(&items)
+		//_, err = o.Raw(sql, pars).QueryRows(&items)
+		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)
+		//_, err = o.Raw(sql, rootIds).QueryRows(&items)
+		err = global.DmSQL["rddp"].Raw(sql, rootIds).Find(&items).Error
 	}
 	return
 }
 
 func GetEnglishClassifyChildByIds(ids []int) (items []*EnglishClassifyList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_classify WHERE id IN (` + utils.GetOrmInReplace(len(ids)) + `) ORDER BY create_time ASC `
-	_, err = o.Raw(sql, ids).QueryRows(&items)
+	//_, err = o.Raw(sql, ids).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, ids).Find(&items).Error
 	return
 }
 
 func GetEnglishReportDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM english_report WHERE 1=1 `
 	if classifyIdSecond > 0 {
 		sql = sql + ` AND classify_id_second=?   ORDER BY stage DESC LIMIT 1`
-		err = o.Raw(sql, classifyIdSecond).QueryRow(&item)
+		//err = o.Raw(sql, classifyIdSecond).QueryRow(&item)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond).First(&item).Error
 	} else {
 		sql = sql + ` AND classify_id_first=?   ORDER BY stage DESC LIMIT 1`
-		err = o.Raw(sql, classifyIdFirst).QueryRow(&item)
+		//err = o.Raw(sql, classifyIdFirst).QueryRow(&item)
+		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst).First(&item).Error
 	}
 	return
 }
 
 // Update 更新
 func (item *EnglishReport) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // ModifyEnglishReportAuthor 更改英文报告作者
 func ModifyEnglishReportAuthor(condition string, pars []interface{}, authorName string) (count int, err error) {
 	//产品权限
-	oRddp := orm.NewOrmUsingDB("rddp")
+	//oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report set author = ? WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
+	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, authorName, pars).Scan(&count).Error
 	return
 }
 
 type EnglishClassify struct {
-	Id            int       `orm:"column(id);pk"`
-	ClassifyName  string    `description:"分类名称"`
-	Sort          int       `description:"排序"`
-	ParentId      int       `description:"父级分类id"`
-	RootId        int       `description:"一级分类ID"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	ClassifyLabel string    `description:"分类标签"`
-	ShowType      int       `description:"展示类型：1-列表 2-专栏"`
-	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
-	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
-	Enabled int `description:"是否可用，1可用，0禁用"`
+	Id            int       `gorm:"column:id;primaryKey;autoIncrement" description:"分类ID"`
+	ClassifyName  string    `gorm:"column:classify_name" description:"分类名称"`
+	Sort          int       `gorm:"column:sort" description:"排序"`
+	ParentId      int       `gorm:"column:parent_id" description:"父级分类ID"`
+	RootId        int       `gorm:"column:root_id" description:"一级分类ID"`
+	CreateTime    time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	ClassifyLabel string    `gorm:"column:classify_label" description:"分类标签"`
+	ShowType      int       `gorm:"column:show_type" description:"展示类型：1-列表 2-专栏"`
+	IsShow        int       `gorm:"column:is_show" description:"是否在小程序显示：1-显示 0-隐藏"`
+	// ClassifyType  int       `gorm:"column:classify_type" description:"分类类型：0-英文报告，1-英文线上路演"`
+	Enabled int `gorm:"column:enabled" description:"是否可用，1可用，0禁用"`
 }
 
 func AddEnglishClassify(item *EnglishClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//lastId, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
+	lastId = int64(item.Id)
 	return
 }
 
 func ModifyEnglishClassify(item *EnglishClassify) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_classify
 	SET
 	classify_name = ?,
@@ -563,129 +596,144 @@ func ModifyEnglishClassify(item *EnglishClassify) (err error) {
 	root_id = ?,
 	modify_time = ? 
 	WHERE id = ? `
-	_, err = o.Raw(sql, item.ClassifyName, item.Sort, item.ParentId, item.RootId, item.ModifyTime, item.Id).Exec()
+	//_, err = o.Raw(sql, item.ClassifyName, item.Sort, item.ParentId, item.RootId, item.ModifyTime, item.Id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, item.ClassifyName, item.Sort, item.ParentId, item.RootId, item.ModifyTime).Error
 	return
 }
 
 // UpdateEnglishClassifyRootIdByParentId 更新报告分类的顶级ID
 func UpdateEnglishClassifyRootIdByParentId(parentId, rootId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_classify SET root_id = ? WHERE parent_id=? "
-	_, err = o.Raw(sql, rootId, parentId).Exec()
+	//	_, err = o.Raw(sql, rootId, parentId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, rootId, parentId).Error
 	return
 }
 
 // UpdateClassify 更新分类
 func (classifyInfo *EnglishClassify) UpdateEnglishClassify(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(classifyInfo, cols...)
-
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(classifyInfo, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(classifyInfo).Error
 	return
 }
 
 // DeleteEnglishClassify 删除英文分类
 func DeleteEnglishClassify(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM english_classify WHERE id =? `
-	_, err = o.Raw(sql, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyId).Error
 	return
 }
 
 func GetEnglishClassifyChildCounts(parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=? `
-	err = o.Raw(sql, parentId).QueryRow(&count)
+	//	err = o.Raw(sql, parentId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&count).Error
 	return
 }
 
 func GetEnglishReportCounts(classifyId, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if parentId == 0 {
 		sql = `SELECT COUNT(1) AS count FROM english_report WHERE classify_id_first=? `
 	} else {
 		sql = `SELECT COUNT(1) AS count FROM english_report WHERE classify_id_second=? `
 	}
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	//err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 func GetEnglishClassifyCountsByName(name string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM english_classify WHERE classify_name=? AND parent_id = ? `
-	err = o.Raw(sql, name, parentId).QueryRow(&count)
+	//err = o.Raw(sql, name, parentId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, name, parentId).Scan(&count).Error
 	return
 }
 
 // GetEnglishFirstClassifyList 获取一级、二级分类列表
 func GetEnglishFirstClassifyList() (items []*EnglishClassifyList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_classify WHERE parent_id=0  ORDER BY sort ASC,create_time`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetEnglishSecondClassifyList 获取一级、二级分类列表
 func GetEnglishSecondClassifyList(rootIds []int) (items []*EnglishClassifyList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_classify WHERE root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) and parent_id>0 and root_id=parent_id ORDER BY sort ASC,create_time ASC`
-	_, err = o.Raw(sql, rootIds).QueryRows(&items)
+	//_, err = o.Raw(sql, rootIds).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, rootIds).Find(&items).Error
 	return
 }
 
 func GetEnglishFirstClassifyListCount() (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sqlCount := `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0`
-	err = o.Raw(sqlCount).QueryRow(&count)
+	//err = o.Raw(sqlCount).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sqlCount).Scan(&count).Error
 	return
 }
 
 func GetEnglishReportClassifyById(classifyId int) (item *EnglishClassify, err error) {
 	sql := `SELECT * FROM english_classify WHERE id=?`
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&item).Error
 	return
 }
 
 func GetEnglishReportClassifyByIds(classifyIds []int) (list []*EnglishClassify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_classify WHERE id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, classifyIds).QueryRows(&list)
+	//_, err = o.Raw(sql, classifyIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, classifyIds).Find(&list).Error
 	return
 }
 
 // UpdateEnglishReportSecondClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishReportSecondClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_report SET classify_name_second = ? WHERE classify_id_second = ? "
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	//	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateEnglishReportFirstClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishReportFirstClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_report SET classify_name_first = ? WHERE classify_id_first = ? "
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateEnglishReportFirstClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishReportByClassifyId(classifyFirstName, classifySecondName string, firstClassifyId, secondClassifyId int, ids string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_report SET classify_name_first = ?,classify_name_second = ?,classify_id_first=?, classify_id_second =?  WHERE id IN (" + ids + ") "
-	_, err = o.Raw(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Exec()
+	//_, err = o.Raw(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Error
 	return
 }
 
 func UpdateEnglishReportClassifyByFirstSecondClassifyId(classifyId, parentId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	// 更新相关联的二级分类的parentId,和classify_name_second
 	sql := `update english_report r
 LEFT JOIN english_classify c ON r.classify_id_second = c.id
 SET r.classify_id_first=c.parent_id, r.classify_name_second=c.classify_name
 where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classify_name) and r.classify_id_second =?`
-	_, err = o.Raw(sql, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyId).Error
 	if err != nil {
 		return
 	}
@@ -694,7 +742,8 @@ where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classif
     LEFT JOIN english_classify c ON r.classify_id_first = c.id
     SET r.classify_name_first=c.classify_name
 where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
-	_, err = o.Raw(sql, parentId).Exec()
+	//_, err = o.Raw(sql, parentId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, parentId).Error
 	if err != nil {
 		return
 	}
@@ -703,31 +752,34 @@ where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
     LEFT JOIN english_classify c ON r.classify_id_first = c.id
     SET r.classify_name_first=c.classify_name
 where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
-	_, err = o.Raw(sql, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyId).Error
 	return
 }
 
 // FetchEnglishReportById 主键获取英文报告
 func FetchEnglishReportById(reportId int) (item *EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // UpdateReport 更新英文报告
 func (reportInfo *EnglishReport) UpdateReport(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(reportInfo, cols...)
-
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(reportInfo, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(reportInfo).Error
 	return
 }
 
 // GetAllEnglishClassify 获取所有英文分类
 func GetAllEnglishClassify() (list []*Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM english_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
@@ -741,9 +793,10 @@ func GetEnglishReportByIds(reportIds []int, fieldArr []string) (list []*EnglishR
 	if len(fieldArr) > 0 {
 		fields = strings.Join(fieldArr, ",")
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT ` + fields + ` FROM english_report WHERE id IN (` + utils.GetOrmInReplace(listLen) + `)`
-	_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }
 
@@ -767,9 +820,10 @@ type EnglishClassifyNameParentName struct {
 }
 
 func GetEnglishClassifyByClassifyNameAndParentName(parentClassiyName, classifyName string) (item EnglishClassifyNameParentName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "SELECT c1.*, c2.classify_name as parent_classify_name FROM english_classify c1 LEFT JOIN english_classify c2 on c1.parent_id = c2.id where c1.parent_id > 0 and c2.classify_name = ? and c1.classify_name= ?"
-	err = o.Raw(sql, parentClassiyName, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, parentClassiyName, classifyName).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, parentClassiyName, classifyName).First(&item).Error
 	return
 }
 
@@ -803,9 +857,10 @@ func (m RSChildClassifyList) Swap(i, j int) {
 
 // GetEnglishClassifyByClassifyNameParentId 获取英文分类
 func GetEnglishClassifyByClassifyNameParentId(classifyName string, parentId int) (item *Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM english_classify where classify_name = ? and parent_id = ? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&item)
+	//	err = o.Raw(sql, classifyName, parentId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, classifyName, parentId).First(&item).Error
 	return
 }
 
@@ -820,7 +875,7 @@ type EnglishClassifyFullName struct {
 
 // GetEnglishClassifyFullNameByIds 获取英文分类名一级/二级/三级
 func GetEnglishClassifyFullNameByIds(classifyIds []int) (list []*EnglishClassifyFullName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 	a.id,
 	a.parent_id,
@@ -833,36 +888,40 @@ FROM
 	LEFT JOIN english_classify b ON a.root_id = b.id
 	LEFT JOIN english_classify c ON a.parent_id = c.id 
 where a.id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, classifyIds).QueryRows(&list)
+	//	_, err = o.Raw(sql, classifyIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, classifyIds).Find(&list).Error
 	return
 }
 
 func (m *EnglishReport) GetItemById(id int) (item *EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report WHERE id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetEnglishClassifies 获取所有英文分类
 func GetEnglishClassifies() (list []*EnglishClassify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM english_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
 // GetEnglishReportStateCount 获取指定状态的报告数量
 func GetEnglishReportStateCount(state int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM english_report WHERE state = ?`
-	err = o.Raw(sql, state).QueryRow(&count)
+	//err = o.Raw(sql, state).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, state).Scan(&count).Error
 	return
 }
 
 // UpdateEnglishReportsStateByCond 批量更新报告状态
 func UpdateEnglishReportsStateByCond(classifyFirstId, classifySecondId, oldState, newState int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	cond := ``
 	if classifyFirstId > 0 {
 		cond += fmt.Sprintf(` AND classify_id_first = %d`, classifyFirstId)
@@ -871,7 +930,8 @@ func UpdateEnglishReportsStateByCond(classifyFirstId, classifySecondId, oldState
 		cond += fmt.Sprintf(` AND classify_id_second = %d`, classifySecondId)
 	}
 	sql := fmt.Sprintf(`UPDATE english_report SET state = ?, pre_publish_time = NULL WHERE state = ? %s`, cond)
-	_, err = o.Raw(sql, newState, oldState).Exec()
+	//	_, err = o.Raw(sql, newState, oldState).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, newState, oldState).Error
 	return
 }
 
@@ -880,16 +940,18 @@ func UpdateEnglishReportsStateBySecondIds(oldState, newState int, secondIds []in
 	if len(secondIds) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	// (有审批流的)未发布->待提交
 	sql := fmt.Sprintf(`UPDATE english_report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
-	_, err = o.Raw(sql, newState, oldState, secondIds).Exec()
+	//_, err = o.Raw(sql, newState, oldState, secondIds).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, newState, oldState, secondIds).Error
 	if err != nil {
 		return
 	}
 	// (无审批流的)待提交->未发布
 	sql = fmt.Sprintf(`UPDATE english_report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second NOT IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
-	_, err = o.Raw(sql, oldState, newState, secondIds).Exec()
+	//_, err = o.Raw(sql, oldState, newState, secondIds).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, oldState, newState, secondIds).Error
 	return
 }
 
@@ -899,8 +961,9 @@ type EnglishClassifySetEnabledReq struct {
 }
 
 func (classifyInfo *EnglishClassify) SetEnabled(id, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//	o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -912,12 +975,14 @@ func (classifyInfo *EnglishClassify) SetEnabled(id, enabled int) (err error) {
 		}
 	}()
 	sql := ` UPDATE english_classify SET enabled =?  WHERE id = ?`
-	_, err = to.Raw(sql, enabled, id).Exec()
+	//_, err = to.Raw(sql, enabled, id).Exec()
+	err = to.Exec(sql, enabled, id).Error
 	if err != nil {
 		return
 	}
 	sql = ` UPDATE english_classify SET enabled =?  WHERE parent_id = ? or root_id = ?`
-	_, err = to.Raw(sql, enabled, id, id).Exec()
+	//	_, err = to.Raw(sql, enabled, id, id).Exec()
+	err = to.Exec(sql, enabled, id, id).Error
 	if err != nil {
 		return
 	}
@@ -925,16 +990,18 @@ func (classifyInfo *EnglishClassify) SetEnabled(id, enabled int) (err error) {
 }
 
 func ModifyEnglishReportPdfUrl(reportId int, detailPdfUrl string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET detail_pdf_url=? WHERE id=? `
-	_, err = o.Raw(sql, detailPdfUrl, reportId).Exec()
+	//_, err = o.Raw(sql, detailPdfUrl, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, detailPdfUrl, reportId).Error
 	return
 }
 
 func ModifyEnglishReportImgUrl(reportId int, detailImgUrl string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET detail_img_url=? WHERE id=? `
-	_, err = o.Raw(sql, detailImgUrl, reportId).Exec()
+	//_, err = o.Raw(sql, detailImgUrl, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, detailImgUrl, reportId).Error
 	return
 }
 
@@ -987,17 +1054,19 @@ func FormatEnglishReport2ListItem(origin *EnglishReport) (item *EnglishReportLis
 
 // UpdateEnglishReportEmailHasFail 标记报告邮件发送失败
 func UpdateEnglishReportEmailHasFail(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET email_has_fail = 1 WHERE id = ?`
-	_, err = o.Raw(sql, reportId).Exec()
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
 
 // UpdatePdfUrlEnglishReportById 清空pdf相关字段
 func UpdatePdfUrlEnglishReportById(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report SET detail_img_url = '',detail_pdf_url='',modify_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, reportId).Exec()
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
 
@@ -1005,12 +1074,13 @@ func GetEnglishReportFieldsByIds(ids []int, fields []string) (items []*EnglishRe
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	field := " * "
 	if len(fields) > 0 {
 		field = fmt.Sprintf(" %s ", strings.Join(fields, ","))
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM english_report WHERE id IN (%s)`, field, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).QueryRows(&items)
+	//	_, err = o.Raw(sql, ids).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, ids).Find(&items).Error
 	return
 }