Browse Source

orm->grom

kobe6258 5 months ago
parent
commit
0c470cc969
3 changed files with 28 additions and 25 deletions
  1. 23 23
      models/classify.go
  2. 4 1
      models/english_report.go
  3. 1 1
      models/report.go

+ 23 - 23
models/classify.go

@@ -191,29 +191,29 @@ func FindByIdClassify(classifyId int) (item *Classify, err error) {
 }
 
 type ClassifyList struct {
-	Id                    int             `gorm:"column:id" json:"id"`                                 //`orm:"column(id);pk" gorm:"primaryKey" `
-	ClassifyName          string          `gorm:"column:classify_name" json:"classify_name"`           //`description:"分类名称"`
-	Sort                  int             `gorm:"column:sort" json:"sort"`                             //`description:"排序"`
-	ParentId              int             `gorm:"column:parent_id" json:"parent_id"`                   //`description:"父级分类id"`
-	CreateTime            time.Time       `gorm:"column:create_time" json:"create_time"`               //`description:"创建时间"`
-	ModifyTime            time.Time       `gorm:"column:modify_time" json:"modify_time"`               //`description:"修改时间"`
-	Abstract              string          `gorm:"column:abstract" json:"abstract"`                     //`description:"简介"`
-	Descript              string          `gorm:"column:descript" json:"descript"`                     //`description:"描述"`
-	ClassifyLabel         string          `gorm:"column:classify_label" json:"classify_label"`         //`description:"分类标签"`
-	ShowType              int             `gorm:"column:show_type" json:"show_type"`                   //`description:"展示类型:1-列表 2-专栏"`
-	HasTeleconference     int             `gorm:"column:has_teleconference" json:"has_teleconference"` //`description:"是否有电话会:0-否 1-是"`
-	IsShow                int             `gorm:"column:is_show" json:"is_show"`                       //`description:"是否在小程序显示:1-显示 0-隐藏"`
-	YbFiccSort            int             `gorm:"column:yb_ficc_sort" json:"yb_ficc_sort"`             //`description:"小程序FICC页排序"`
-	YbFiccIcon            string          `gorm:"column:yb_ficc_icon" json:"yb_ficc_icon"`             // `description:"小程序FICC页icon"`
-	YbFiccPcIcon          string          `gorm:"column:yb_ficc_pc_icon" json:"yb_ficc_pc_icon"`       //`description:"小程序PC端FICC页背景图"`
-	YbIconUrl             string          `gorm:"column:yb_icon_url" json:"yb_icon_url"`               //`description:"小程序已购页icon"`
-	YbBgUrl               string          `gorm:"column:yb_bg_url" json:"yb_bg_url"`                   //`description:"小程序已购详情背景图"`
-	YbListImg             string          `gorm:"column:yb_list_img" json:"yb_list_img"`               //`description:"小程序研报列表封面图"`
-	YbShareBgImg          string          `gorm:"column:yb_share_bg_img" json:"yb_share_bg_img"`       //`description:"小程序研报详情分享背景图"`
-	YbRightBanner         string          `gorm:"column:yb_right_banner" json:"yb_right_banner"`       //`description:"Pc端详情页,右侧,报告合集背景图"`
-	RelateTel             int             `gorm:"column:relate_tel" json:"relate_tel"`                 //`description:"是否在电话会中可选: 0-否; 1-是"`
-	RelateVideo           int             `gorm:"column:relate_video" json:"relate_video"`             //`description:"是否在路演视频中可选: 0-否; 1-是"`
-	Enabled               int             `gorm:"column:enabled" json:"enabled"`                       //`description:"是否可用,1可用,0禁用"`
+	Id                    int             `gorm:"column:id"`                 //`orm:"column(id);pk" gorm:"primaryKey" `
+	ClassifyName          string          `gorm:"column:classify_name"`      //`description:"分类名称"`
+	Sort                  int             `gorm:"column:sort"`               //`description:"排序"`
+	ParentId              int             `gorm:"column:parent_id"`          //`description:"父级分类id"`
+	CreateTime            time.Time       `gorm:"column:create_time"`        //`description:"创建时间"`
+	ModifyTime            time.Time       `gorm:"column:modify_time"`        //`description:"修改时间"`
+	Abstract              string          `gorm:"column:abstract"`           //`description:"简介"`
+	Descript              string          `gorm:"column:descript"`           //`description:"描述"`
+	ClassifyLabel         string          `gorm:"column:classify_label"`     //`description:"分类标签"`
+	ShowType              int             `gorm:"column:show_type"`          //`description:"展示类型:1-列表 2-专栏"`
+	HasTeleconference     int             `gorm:"column:has_teleconference"` //`description:"是否有电话会:0-否 1-是"`
+	IsShow                int             `gorm:"column:is_show"`            //`description:"是否在小程序显示:1-显示 0-隐藏"`
+	YbFiccSort            int             `gorm:"column:yb_ficc_sort"`       //`description:"小程序FICC页排序"`
+	YbFiccIcon            string          `gorm:"column:yb_ficc_icon"`       // `description:"小程序FICC页icon"`
+	YbFiccPcIcon          string          `gorm:"column:yb_ficc_pc_icon"`    //`description:"小程序PC端FICC页背景图"`
+	YbIconUrl             string          `gorm:"column:yb_icon_url"`        //`description:"小程序已购页icon"`
+	YbBgUrl               string          `gorm:"column:yb_bg_url"`          //`description:"小程序已购详情背景图"`
+	YbListImg             string          `gorm:"column:yb_list_img"`        //`description:"小程序研报列表封面图"`
+	YbShareBgImg          string          `gorm:"column:yb_share_bg_img"`    //`description:"小程序研报详情分享背景图"`
+	YbRightBanner         string          `gorm:"column:yb_right_banner"`    //`description:"Pc端详情页,右侧,报告合集背景图"`
+	RelateTel             int             `gorm:"column:relate_tel"`         //`description:"是否在电话会中可选: 0-否; 1-是"`
+	RelateVideo           int             `gorm:"column:relate_video"`       //`description:"是否在路演视频中可选: 0-否; 1-是"`
+	Enabled               int             `gorm:"column:enabled"`            //`description:"是否可用,1可用,0禁用"`
 	Child                 []*ClassifyList `gorm:"-"`
 	ClassifyMenuId        int             `gorm:"-"` //`description:"二级分类-子目录ID"`
 	ClassifyMenuList      []*ClassifyMenu `gorm:"-"`

+ 4 - 1
models/english_report.go

@@ -562,7 +562,10 @@ func ModifyEnglishReportAuthor(condition string, pars []interface{}, authorName
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, authorName, pars...).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...).Scan(&count).Error
+	//result := global.DmSQL["rddp"].Exec(sql, utils.ForwardPars(pars, authorName)...)
+	//count = int(result.RowsAffected)
+	//err = result.Error
 	return
 }
 

+ 1 - 1
models/report.go

@@ -1353,7 +1353,7 @@ func ModifyReportAuthor(condition string, pars []interface{}, authorName string)
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...).Scan(&count).Error
 	return
 }