Explorar o código

beego orm -> gorm 结构体优化

gmy hai 6 meses
pai
achega
6b4f429a89

+ 9 - 9
models/english_company.go

@@ -8,15 +8,15 @@ import (
 // EnglishCompany 英文客户
 type EnglishCompany struct {
 	CompanyId   int       `gorm:"primaryKey;autoIncrement;column:company_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:"更新时间"`
+	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:"更新时间"`
 }
 
 func (item *EnglishCompany) TableName() string {

+ 24 - 24
models/english_report.go

@@ -6,30 +6,30 @@ import (
 
 type EnglishReportDetail struct {
 	Id                 int    `gorm:"primaryKey;autoIncrement;column: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         string `description:"修改时间"`
-	State              int    `description:"1:未发布,2:已发布"`
-	PublishTime        string `description:"发布时间"`
-	Stage              int    `description:"期数"`
-	MsgIsSend          int    `description:"消息是否已发送,0:否,1:是"`
-	Content            string `description:"内容"`
-	VideoUrl           string `description:"音频文件URL"`
-	VideoName          string `description:"音频文件名称"`
-	VideoPlaySeconds   string `description:"音频播放时长"`
-	ContentSub         string `description:"内容前两个章节"`
-	ThsMsgIsSend       int    `description:"客户群消息是否已发送,0:否,1:是"`
-	HasChapter         int    `description:"是否有章节 0-否 1-是"`
-	ChapterType        string `description:"章节类型 day-晨报 week-周报"`
-	Overview           string `description:"英文概述部分"`
+	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         string `gorm:"column:modify_time" description:"修改时间"`
+	State              int    `gorm:"column:state" description:"1:未发布,2:已发布"`
+	PublishTime        string `gorm:"column:publish_time" description:"发布时间"`
+	Stage              int    `gorm:"column:stage" description:"期数"`
+	MsgIsSend          int    `gorm:"column:msg_is_send" description:"消息是否已发送,0:否,1:是"`
+	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:"音频播放时长"`
+	ContentSub         string `gorm:"column:content_sub" description:"内容前两个章节"`
+	ThsMsgIsSend       int    `gorm:"column:ths_msg_is_send" description:"客户群消息是否已发送,0:否,1:是"`
+	HasChapter         int    `gorm:"column:has_chapter" description:"是否有章节 0-否 1-是"`
+	ChapterType        string `gorm:"column:chapter_type" description:"章节类型 day-晨报 week-周报"`
+	Overview           string `gorm:"column:overview" description:"英文概述部分"`
 }
 
 func GetEnglishReportByCode(reportCode string) (item *EnglishReportDetail, err error) {

+ 10 - 10
models/english_report_email.go

@@ -8,16 +8,16 @@ import (
 // EnglishReportEmail 英文研报-邮箱/客户联系人
 type EnglishReportEmail struct {
 	Id           int       `gorm:"primaryKey;autoIncrement;column:id"`
-	CompanyId    int       `description:"客户ID"`
-	Name         string    `description:"联系人名称"`
-	Email        string    `description:"邮箱地址"`
-	ViewTotal    int       `description:"累计点击量/阅读量"`
-	LastViewTime time.Time `description:"最后阅读时间"`
-	IsDeleted    int       `description:"删除状态:0-正常;1-已删除"`
-	AdminId      int       `description:"创建人ID"`
-	AdminName    string    `description:"创建人姓名"`
-	CreateTime   time.Time `description:"创建时间"`
-	ModifyTime   time.Time `description:"更新时间"`
+	CompanyId    int       `gorm:"column:company_id" description:"客户ID"`
+	Name         string    `gorm:"column:name" description:"联系人名称"`
+	Email        string    `gorm:"column:email" description:"邮箱地址"`
+	ViewTotal    int       `gorm:"column:view_total" description:"累计点击量/阅读量"`
+	LastViewTime time.Time `gorm:"column:last_view_time" description:"最后阅读时间"`
+	IsDeleted    int       `gorm:"column:is_deleted" description:"删除状态:0-正常;1-已删除"`
+	AdminId      int       `gorm:"column:admin_id" description:"创建人ID"`
+	AdminName    string    `gorm:"column:admin_name" description:"创建人姓名"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"更新时间"`
 }
 
 func (item *EnglishReportEmail) TableName() string {

+ 3 - 3
models/english_report_email_pv.go

@@ -8,9 +8,9 @@ import (
 // EnglishReportEmailPV 英文研报-邮箱pv
 type EnglishReportEmailPV struct {
 	Id         int       `gorm:"primaryKey;autoIncrement;column:id"`
-	ReportId   int       `description:"英文报告ID"`
-	EmailId    int       `description:"邮箱ID"`
-	CreateTime time.Time `description:"创建时间"`
+	ReportId   int       `gorm:"column:report_id" description:"英文报告ID"`
+	EmailId    int       `gorm:"column:email_id" description:"邮箱ID"`
+	CreateTime time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // InsertTrialEnglishReportEmailPV ETA试用平台-新增英文邮箱PV

+ 47 - 50
models/report.go

@@ -2,59 +2,56 @@ package models
 
 import (
 	"eta_gn/eta_report/global"
-	"time"
 )
 
 type Report struct {
-	Id                 int    `gorm:"primaryKey;autoIncrement;column: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         string `description:"修改时间"`
-	State              int    `description:"1:未发布,2:已发布"`
-	PublishTime        string `description:"发布时间"`
-	PrePublishTime     string `description:"预发布时间"`
-	Stage              int    `description:"期数"`
-	MsgIsSend          int    `description:"消息是否已发送,0:否,1:是"`
-	Content            string `description:"内容"`
-	VideoUrl           string `description:"音频文件URL"`
-	VideoName          string `description:"音频文件名称"`
-	VideoPlaySeconds   string `description:"音频播放时长"`
-	VideoSize          string `description:"音频文件大小,单位M"`
-	ContentSub         string `description:"内容前两个章节"`
-	IsShowNewLabel     int    `description:"是否显示新标签"`
-	IsCurrentDate      int    `description:"是否当前日期"`
-	ClassifyName       string `description:"分类名称"`
-	HasChapter         int    `description:"是否有章节"`
-
-	// eta1.8.3(研报改版)相关内容
-	ContentStruct       string    `description:"内容组件"`
-	LastModifyAdminId   int       `description:"最后更新人ID"`
-	LastModifyAdminName string    `description:"最后更新人姓名"`
-	ContentModifyTime   time.Time `description:"内容更新时间"`
-	Pv                  int       `description:"pv"`
-	Uv                  int       `description:"uv"`
-	HeadImg             string    `description:"报告头图地址"`
-	EndImg              string    `description:"报告尾图地址"`
-	HeadStyle           string    `description:"版头样式"`
-	EndStyle            string    `description:"版尾样式"`
-	CanvasColor         string    `description:"画布颜色"`
-	NeedSplice          int       `description:"是否拼接版头版位的标记,主要是为了兼容历史报告。0-不需要 1-需要"`
-	HeadResourceId      int       `description:"版头资源ID"`
-	EndResourceId       int       `description:"版尾资源ID"`
-	ClassifyIdThird     int       `description:"三级分类id"`
-	ClassifyNameThird   string    `description:"三级分类名称"`
-	CollaborateType     int8      `description:"协作方式,1:个人,2:多人协作。默认:1"`
-	ReportLayout        int8      `description:"报告布局,1:常规布局,2:智能布局。默认:1"`
-	IsPublicPublish     int8      `description:"是否公开发布,1:是,2:否"`
-	ReportCreateTime    time.Time `description:"报告时间创建时间"`
+	Id                  int    `gorm:"primaryKey;autoIncrement;column: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          string `gorm:"column:modify_time" description:"修改时间"`
+	State               int    `gorm:"column:state" description:"1:未发布,2:已发布"`
+	PublishTime         string `gorm:"column:publish_time" description:"发布时间"`
+	PrePublishTime      string `gorm:"column:pre_publish_time" description:"预发布时间"`
+	Stage               int    `gorm:"column:stage" description:"期数"`
+	MsgIsSend           int    `gorm:"column:msg_is_send" description:"消息是否已发送,0:否,1:是"`
+	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:"内容前两个章节"`
+	IsShowNewLabel      int    `gorm:"column:is_show_new_label" description:"是否显示新标签"`
+	IsCurrentDate       int    `gorm:"column:is_current_date" description:"是否当前日期"`
+	ClassifyName        string `gorm:"column:classify_name" description:"分类名称"`
+	HasChapter          int    `gorm:"column:has_chapter" description:"是否有章节"`
+	ContentStruct       string `gorm:"column:content_struct" description:"内容组件"`
+	LastModifyAdminId   int    `gorm:"column:last_modify_admin_id" description:"最后更新人ID"`
+	LastModifyAdminName string `gorm:"column:last_modify_admin_name" description:"最后更新人姓名"`
+	ContentModifyTime   string `gorm:"column:content_modify_time" description:"内容更新时间"`
+	Pv                  int    `gorm:"column:pv" description:"pv"`
+	Uv                  int    `gorm:"column:uv" description:"uv"`
+	HeadImg             string `gorm:"column:head_img" description:"报告头图地址"`
+	EndImg              string `gorm:"column:end_img" description:"报告尾图地址"`
+	HeadStyle           string `gorm:"column:head_style" description:"版头样式"`
+	EndStyle            string `gorm:"column:end_style" description:"版尾样式"`
+	CanvasColor         string `gorm:"column:canvas_color" description:"画布颜色"`
+	NeedSplice          int    `gorm:"column:need_splice" description:"是否拼接版头版位的标记,主要是为了兼容历史报告。0-不需要 1-需要"`
+	HeadResourceId      int    `gorm:"column:head_resource_id" description:"版头资源ID"`
+	EndResourceId       int    `gorm:"column:end_resource_id" description:"版尾资源ID"`
+	ClassifyIdThird     int    `gorm:"column:classify_id_third" description:"三级分类id"`
+	ClassifyNameThird   string `gorm:"column:classify_name_third" description:"三级分类名称"`
+	CollaborateType     int8   `gorm:"column:collaborate_type" description:"协作方式,1:个人,2:多人协作。默认:1"`
+	ReportLayout        int8   `gorm:"column:report_layout" description:"报告布局,1:常规布局,2:智能布局。默认:1"`
+	IsPublicPublish     int8   `gorm:"column:is_public_publish" description:"是否公开发布,1:是,2:否"`
+	ReportCreateTime    string `gorm:"column:report_create_time" description:"报告时间创建时间"`
 }
 
 func GetReportByCode(reportCode string) (item *Report, err error) {

+ 26 - 26
models/report_chapter.go

@@ -8,32 +8,32 @@ import (
 // ReportChapter 报告章节
 type ReportChapter struct {
 	ReportChapterId   int       `gorm:"primaryKey;autoIncrement;column:reportChapterId"`
-	ReportId          int       `description:"报告ID"`
-	ReportType        string    `description:"报告类型 day-晨报 week-周报"`
-	ClassifyIdFirst   int       `description:"一级分类id"`
-	ClassifyNameFirst string    `description:"一级分类名称"`
-	TypeId            int       `description:"品种ID"`
-	TypeName          string    `description:"品种名称"`
-	Title             string    `description:"标题"`
-	Abstract          string    `description:"摘要"`
-	AddType           int       `description:"新增方式:1:新增报告,2:继承报告"`
-	Author            string    `description:"作者"`
-	Content           string    `description:"内容"`
-	ContentSub        string    `description:"内容前两个章节"`
-	Stage             int       `description:"期数"`
-	Trend             string    `description:"趋势观点"`
-	Sort              int       `description:"排序: 数值越小越靠前"`
-	IsEdit            int       `description:"是否已编辑 0-待编辑 1-已编辑"`
-	PublishState      int       `description:"发布状态 1-待发布,2-已发布"`
-	PublishTime       time.Time `description:"发布时间"`
-	VideoUrl          string    `description:"音频文件URL"`
-	VideoName         string    `description:"音频文件名称"`
-	VideoPlaySeconds  string    `description:"音频播放时长"`
-	VideoSize         string    `description:"音频文件大小,单位M"`
-	VideoKind         int       `description:"音频生成方式:1,手动上传,2:自动生成"`
-	CreateTime        string    `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
-	OriginalVideoUrl  string    `description:"原始音频文件URL"`
+	ReportId          int       `gorm:"column:report_id" description:"报告ID"`
+	ReportType        string    `gorm:"column:report_type" description:"报告类型 day-晨报 week-周报"`
+	ClassifyIdFirst   int       `gorm:"column:classify_id_first" description:"一级分类id"`
+	ClassifyNameFirst string    `gorm:"column:classify_name_first" description:"一级分类名称"`
+	TypeId            int       `gorm:"column:type_id" description:"品种ID"`
+	TypeName          string    `gorm:"column:type_name" description:"品种名称"`
+	Title             string    `gorm:"column:title" description:"标题"`
+	Abstract          string    `gorm:"column:abstract" description:"摘要"`
+	AddType           int       `gorm:"column:add_type" description:"新增方式:1:新增报告,2:继承报告"`
+	Author            string    `gorm:"column:author" description:"作者"`
+	Content           string    `gorm:"column:content" description:"内容"`
+	ContentSub        string    `gorm:"column:content_sub" description:"内容前两个章节"`
+	Stage             int       `gorm:"column:stage" description:"期数"`
+	Trend             string    `gorm:"column:trend" description:"趋势观点"`
+	Sort              int       `gorm:"column:sort" description:"排序: 数值越小越靠前"`
+	IsEdit            int       `gorm:"column:is_edit" description:"是否已编辑 0-待编辑 1-已编辑"`
+	PublishState      int       `gorm:"column:publish_state" description:"发布状态 1-待发布,2-已发布"`
+	PublishTime       time.Time `gorm:"column:publish_time" 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"`
+	VideoKind         int       `gorm:"column:video_kind" description:"音频生成方式:1,手动上传,2:自动生成"`
+	CreateTime        string    `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
+	OriginalVideoUrl  string    `gorm:"column:original_video_url" description:"原始音频文件URL"`
 }
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表

+ 21 - 21
models/report_chapter_type.go

@@ -8,27 +8,27 @@ import (
 
 type ReportChapterType struct {
 	ReportChapterTypeId    int       `gorm:"primaryKey;autoIncrement;column:report_chapter_type_id"`
-	ReportChapterTypeKey   string    `description:"章节key"`
-	ReportChapterTypeThumb string    `description:"H5展示的图片"`
-	BannerUrl              string    `description:"banner显示图片"`
-	ReportChapterTypeName  string    `description:"报告章节类型名称"`
-	Sort                   int       `description:"排序字段"`
-	Enabled                int       `description:"启禁用状态"`
-	CreatedTime            time.Time `description:"创建时间"`
-	LastUpdatedTime        time.Time `description:"更新时间"`
-	ResearchType           string    `description:"研报类型"`
-	SelectedImage          string    `description:"选中时的图片"`
-	UnselectedImage        string    `description:"没选中时的图片"`
-	PcSelectedImage        string    `description:"PC-选中的图片"`
-	PcUnselectedImage      string    `description:"PC-未选中的图片"`
-	EditImgUrl             string    `description:"管理后台编辑时选用的图"`
-	TickerTitle            string    `description:"指标列的标题"`
-	IsShow                 int       `description:"是否显示(研报小程序端根据此字段判断)"`
-	PauseStartTime         string    `description:"暂停开始日期"`
-	PauseEndTime           string    `description:"暂停结束日期"`
-	IsSet                  int       `description:"是否设置:0为设置,1已设置"`
-	YbIconUrl              string    `description:"研报小程序icon"`
-	YbBottomIcon           string    `description:"研报小程序详情底部icon"`
+	ReportChapterTypeKey   string    `gorm:"column:report_chapter_type_key" description:"章节key"`
+	ReportChapterTypeThumb string    `gorm:"column:report_chapter_type_thumb" description:"H5展示的图片"`
+	BannerUrl              string    `gorm:"column:banner_url" description:"banner显示图片"`
+	ReportChapterTypeName  string    `gorm:"column:report_chapter_type_name" description:"报告章节类型名称"`
+	Sort                   int       `gorm:"column:sort" description:"排序字段"`
+	Enabled                int       `gorm:"column:enabled" description:"启禁用状态"`
+	CreatedTime            time.Time `gorm:"column:created_time" description:"创建时间"`
+	LastUpdatedTime        time.Time `gorm:"column:last_updated_time" description:"更新时间"`
+	ResearchType           string    `gorm:"column:research_type" description:"研报类型"`
+	SelectedImage          string    `gorm:"column:selected_image" description:"选中时的图片"`
+	UnselectedImage        string    `gorm:"column:unselected_image" description:"没选中时的图片"`
+	PcSelectedImage        string    `gorm:"column:pc_selected_image" description:"PC-选中的图片"`
+	PcUnselectedImage      string    `gorm:"column:pc_unselected_image" description:"PC-未选中的图片"`
+	EditImgUrl             string    `gorm:"column:edit_img_url" description:"管理后台编辑时选用的图"`
+	TickerTitle            string    `gorm:"column:ticker_title" description:"指标列的标题"`
+	IsShow                 int       `gorm:"column:is_show" description:"是否显示(研报小程序端根据此字段判断)"`
+	PauseStartTime         string    `gorm:"column:pause_start_time" description:"暂停开始日期"`
+	PauseEndTime           string    `gorm:"column:pause_end_time" description:"暂停结束日期"`
+	IsSet                  int       `gorm:"column:is_set" description:"是否设置:0为设置,1已设置"`
+	YbIconUrl              string    `gorm:"column:yb_icon_url" description:"研报小程序icon"`
+	YbBottomIcon           string    `gorm:"column:yb_bottom_icon" description:"研报小程序详情底部icon"`
 }
 
 // GetAllReportChapterTypeListByResearchType 通过报告类型获取章节类型列表

+ 43 - 43
models/smart_report.go

@@ -12,49 +12,49 @@ import (
 // SmartReport 智能研报
 type SmartReport struct {
 	SmartReportId       int       `gorm:"primaryKey;autoIncrement;column:smart_report_id" description:"智能研报ID"`
-	ReportCode          string    `description:"报告唯一编码"`
-	ClassifyIdFirst     int       `description:"一级分类ID"`
-	ClassifyNameFirst   string    `description:"一级分类名称"`
-	ClassifyIdSecond    int       `description:"二级分类ID"`
-	ClassifyNameSecond  string    `description:"二级分类名称"`
-	AddType             int       `description:"新增方式:1-新增报告;2-继承报告"`
-	Title               string    `description:"标题"`
-	Abstract            string    `description:"摘要"`
-	Author              string    `description:"作者"`
-	Frequency           string    `description:"频度"`
-	Stage               int       `description:"期数"`
-	Content             string    `description:"内容"`
-	ContentSub          string    `description:"内容前两个章节"`
-	ContentStruct       string    `description:"内容组件"`
-	VideoUrl            string    `description:"音频文件URL"`
-	VideoName           string    `description:"音频文件名称"`
-	VideoPlaySeconds    float64   `description:"音频播放时长"`
-	VideoSize           string    `description:"音频文件大小,单位M"`
-	AdminId             int       `description:"创建者ID"`
-	AdminRealName       string    `description:"创建者姓名"`
-	State               int       `description:"发布状态:1-待发布;2-已发布"`
-	LastModifyAdminId   int       `description:"最后更新人ID"`
-	LastModifyAdminName string    `description:"最后更新人姓名"`
-	ContentModifyTime   time.Time `description:"内容更新时间"`
-	Pv                  int       `description:"pv"`
-	Uv                  int       `description:"uv"`
-	PublishTime         time.Time `description:"发布时间"`
-	PrePublishTime      time.Time `description:"预发布时间"`
-	PreMsgSend          int       `description:"定时发布后是否推送模版消息:0-否;1-是"`
-	MsgIsSend           int       `description:"消息是否已发送:0-否;1-是"`
-	MsgSendTime         time.Time `description:"模版消息发送时间"`
-	DetailImgUrl        string    `description:"报告详情长图地址"`
-	DetailPdfUrl        string    `description:"报告详情PDF地址"`
-	CreateTime          time.Time `description:"创建时间"`
-	ModifyTime          time.Time `description:"修改时间"`
-	HeadImg             string    `description:"报告头图地址"`
-	EndImg              string    `description:"报告尾图地址"`
-	CanvasColor         string    `description:"画布颜色"`
-	NeedSplice          int       `description:"0-不需要 1-需要"`
-	HeadResourceId      int       `description:"版头资源ID"`
-	EndResourceId       int       `description:"版尾资源ID"`
-	HeadStyle           string    `description:"版头样式"`
-	EndStyle            string    `description:"版尾样式"`
+	ReportCode          string    `gorm:"column:banner_url" description:"报告唯一编码"`
+	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:"二级分类名称"`
+	AddType             int       `gorm:"column:add_type"description:"新增方式:1-新增报告;2-继承报告"`
+	Title               string    `gorm:"column:title"description:"标题"`
+	Abstract            string    `gorm:"column:abstract"description:"摘要"`
+	Author              string    `gorm:"column:author"description:"作者"`
+	Frequency           string    `gorm:"column:frequency"description:"频度"`
+	Stage               int       `gorm:"column:stage"description:"期数"`
+	Content             string    `gorm:"column:content"description:"内容"`
+	ContentSub          string    `gorm:"column:content_sub"description:"内容前两个章节"`
+	ContentStruct       string    `gorm:"column:content_struct"description:"内容组件"`
+	VideoUrl            string    `gorm:"column:video_url"description:"音频文件URL"`
+	VideoName           string    `gorm:"column:video_name"description:"音频文件名称"`
+	VideoPlaySeconds    float64   `gorm:"column:video_play_seconds"description:"音频播放时长"`
+	VideoSize           string    `gorm:"column:video_size"description:"音频文件大小,单位M"`
+	AdminId             int       `gorm:"column:admin_id"description:"创建者ID"`
+	AdminRealName       string    `gorm:"column:admin_real_name"description:"创建者姓名"`
+	State               int       `gorm:"column:state"description:"发布状态:1-待发布;2-已发布"`
+	LastModifyAdminId   int       `gorm:"column:last_modify_admin_id"description:"最后更新人ID"`
+	LastModifyAdminName string    `gorm:"column:last_modify_admin_name"description:"最后更新人姓名"`
+	ContentModifyTime   time.Time `gorm:"column:content_modify_time"description:"内容更新时间"`
+	Pv                  int       `gorm:"column:pv"description:"pv"`
+	Uv                  int       `gorm:"column:uv"description:"uv"`
+	PublishTime         time.Time `gorm:"column:publish_time"description:"发布时间"`
+	PrePublishTime      time.Time `gorm:"column:pre_publish_time"description:"预发布时间"`
+	PreMsgSend          int       `gorm:"column:pre_msg_send"description:"定时发布后是否推送模版消息:0-否;1-是"`
+	MsgIsSend           int       `gorm:"column:msg_is_send"description:"消息是否已发送:0-否;1-是"`
+	MsgSendTime         time.Time `gorm:"column:msg_send_time"description:"模版消息发送时间"`
+	DetailImgUrl        string    `gorm:"column:detail_img_url"description:"报告详情长图地址"`
+	DetailPdfUrl        string    `gorm:"column:detail_pdf_url"description:"报告详情PDF地址"`
+	CreateTime          time.Time `gorm:"column:create_time"description:"创建时间"`
+	ModifyTime          time.Time `gorm:"column:modify_time"description:"修改时间"`
+	HeadImg             string    `gorm:"column:head_img"description:"报告头图地址"`
+	EndImg              string    `gorm:"column:end_img"description:"报告尾图地址"`
+	CanvasColor         string    `gorm:"column:canvas_color"description:"画布颜色"`
+	NeedSplice          int       `gorm:"column:need_splice"description:"0-不需要 1-需要"`
+	HeadResourceId      int       `gorm:"column:head_resource_id"description:"版头资源ID"`
+	EndResourceId       int       `gorm:"column:end_resource_id"description:"版尾资源ID"`
+	HeadStyle           string    `gorm:"column:head_style"description:"版头样式"`
+	EndStyle            string    `gorm:"column:end_style"description:"版尾样式"`
 }
 
 func (m *SmartReport) TableName() string {