Sfoglia il codice sorgente

ppt新增封面内容字段

hsun 1 anno fa
parent
commit
71c3dc064e

+ 7 - 2
controllers/ppt_english.go

@@ -152,6 +152,7 @@ func (this *PptEnglishController) AddPpt() {
 			ReportType:    req.FirstPage.ReportType,
 			PptDate:       req.FirstPage.PptDate,
 			Content:       req.Content,
+			CoverContent:  req.CoverContent,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
 			AdminId:       this.SysUser.AdminId,
@@ -185,9 +186,10 @@ func (this *PptEnglishController) AddPpt() {
 		pptInfo.ReportType = req.FirstPage.ReportType
 		pptInfo.PptDate = req.FirstPage.PptDate
 		pptInfo.Content = req.Content
+		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
 
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime"})
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent"})
 
 		msg = "保存成功"
 	}
@@ -264,8 +266,9 @@ func (this *PptEnglishController) EditPpt() {
 	pptInfo.ReportType = req.FirstPage.ReportType
 	pptInfo.PptDate = req.FirstPage.PptDate
 	pptInfo.Content = req.Content
+	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime"})
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -282,6 +285,7 @@ func (this *PptEnglishController) EditPpt() {
 			ReportType:    pptInfo.ReportType,
 			PptDate:       pptInfo.PptDate,
 			Content:       pptInfo.Content,
+			CoverContent:  pptInfo.CoverContent,
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
 			CreateTime:    time.Now(),
@@ -672,6 +676,7 @@ func (this *PptEnglishController) SaveLog() {
 		ReportType:    req.FirstPage.ReportType,
 		PptDate:       req.FirstPage.PptDate,
 		Content:       req.Content,
+		CoverContent:  req.CoverContent,
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),

+ 9 - 2
controllers/ppt_v2.go

@@ -152,6 +152,7 @@ func (this *PptV2Controller) AddPpt() {
 			ReportType:    req.FirstPage.ReportType,
 			PptDate:       req.FirstPage.PptDate,
 			Content:       req.Content,
+			CoverContent:  req.CoverContent,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
 			AdminId:       this.SysUser.AdminId,
@@ -186,9 +187,10 @@ func (this *PptV2Controller) AddPpt() {
 		pptInfo.ReportType = req.FirstPage.ReportType
 		pptInfo.PptDate = req.FirstPage.PptDate
 		pptInfo.Content = req.Content
+		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
 
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime"})
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent"})
 
 		msg = "保存成功"
 	}
@@ -265,8 +267,9 @@ func (this *PptV2Controller) EditPpt() {
 	pptInfo.ReportType = req.FirstPage.ReportType
 	pptInfo.PptDate = req.FirstPage.PptDate
 	pptInfo.Content = req.Content
+	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime"})
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -283,6 +286,7 @@ func (this *PptV2Controller) EditPpt() {
 			ReportType:    pptInfo.ReportType,
 			PptDate:       pptInfo.PptDate,
 			Content:       pptInfo.Content,
+			CoverContent:  pptInfo.CoverContent,
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
 			CreateTime:    time.Now(),
@@ -673,6 +677,7 @@ func (this *PptV2Controller) SaveLog() {
 		ReportType:    req.FirstPage.ReportType,
 		PptDate:       req.FirstPage.PptDate,
 		Content:       req.Content,
+		CoverContent:  req.CoverContent,
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),
@@ -1019,6 +1024,7 @@ func (this *PptV2Controller) ToEn() {
 		ReportType:    origin.ReportType,
 		PptDate:       origin.PptDate,
 		Content:       origin.Content,
+		CoverContent:  origin.CoverContent,
 		CreateTime:    time.Now(),
 		ModifyTime:    time.Now(),
 		AdminId:       this.SysUser.AdminId,
@@ -1117,6 +1123,7 @@ func (this *PptV2Controller) BatchToEn() {
 			ReportType:    origin.ReportType,
 			PptDate:       origin.PptDate,
 			Content:       origin.Content,
+			CoverContent:  origin.CoverContent,
 			CreateTime:    nowTime,
 			ModifyTime:    nowTime,
 			AdminId:       this.SysUser.AdminId,

+ 6 - 2
models/ppt_english/ppt_english.go

@@ -24,6 +24,7 @@ type PptEnglish struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享,0:不分享,1:分享"`
 	PublishTime   time.Time `description:"发布时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 type PptEnglishItem struct {
@@ -44,6 +45,7 @@ type PptEnglishItem struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享,0:不分享,1:分享"`
 	PublishTime   time.Time `description:"发布时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 func GetPptEnglishList(condition string, pars []interface{}, startSize, pageSize int) (items []*PptEnglishItem, err error) {
@@ -112,8 +114,9 @@ type AddPptEnglishReq struct {
 		BackIndex    int    `description:"背景图片下标"`
 		TemplateType int    `description:"模版id"`
 	} `description:"首页"`
-	Content string `description:"ppt的json数据"`
-	GroupId int64  `description:"目录id"`
+	Content      string `description:"ppt的json数据"`
+	GroupId      int64  `description:"目录id"`
+	CoverContent string `description:"PPT内容-JSON"`
 }
 
 type AddPptEnglishResp struct {
@@ -249,6 +252,7 @@ type PptEnglishSaveLog struct {
 	AdminId       int       `description:"系统用户id"`
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 // AddPptEnglishSaveLog 新增PPT日志

+ 6 - 2
models/ppt_v2.go

@@ -27,6 +27,7 @@ type PptV2 struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享,0:不分享,1:分享"`
 	PublishTime   time.Time `description:"发布时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 type PptV2Item struct {
@@ -49,6 +50,7 @@ type PptV2Item struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享,0:不分享,1:分享"`
 	PublishTime   time.Time `description:"发布时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int) (items []*PptV2Item, err error) {
@@ -117,8 +119,9 @@ type AddPptV2Req struct {
 		BackIndex    int    `description:"背景图片下标"`
 		TemplateType int    `description:"模版id"`
 	} `description:"首页"`
-	Content string `description:"ppt的json数据"`
-	GroupId int64  `description:"目录id"`
+	Content      string `description:"ppt的json数据"`
+	GroupId      int64  `description:"目录id"`
+	CoverContent string `description:"封面图内容-JSON数据"`
 }
 
 type AddPptResp struct {
@@ -200,6 +203,7 @@ type PptV2SaveLog struct {
 	AdminId       int       `description:"系统用户id"`
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
+	CoverContent  string    `description:"PPT内容-JSON"`
 }
 
 // AddPptV2SaveLog 新增PPT日志

+ 2 - 0
services/ppt/ppt_english_group.go

@@ -209,6 +209,7 @@ func CopyEnglishGroup(groupId int64, adminId int, adminRealName string) (err err
 			ReportType:    v.ReportType,
 			PptDate:       v.PptDate,
 			Content:       v.Content,
+			CoverContent:  v.CoverContent,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
 			AdminId:       adminId,
@@ -734,6 +735,7 @@ func CopyPptEnglish(pptId int, groupId int64, adminId int, adminRealName string)
 		ReportType:    pptInfo.ReportType,
 		PptDate:       pptInfo.PptDate,
 		Content:       pptInfo.Content,
+		CoverContent:  pptInfo.CoverContent,
 		CreateTime:    time.Now(),
 		ModifyTime:    time.Now(),
 		AdminId:       adminId,

+ 2 - 0
services/ppt/ppt_group.go

@@ -376,6 +376,7 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 			ReportType:    v.ReportType,
 			PptDate:       v.PptDate,
 			Content:       v.Content,
+			CoverContent:  v.CoverContent,
 			PptUrl:        v.PptUrl,
 			PptxUrl:       v.PptxUrl,
 			CreateTime:    time.Now(),
@@ -926,6 +927,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		ReportType:    pptInfo.ReportType,
 		PptDate:       pptInfo.PptDate,
 		Content:       pptInfo.Content,
+		CoverContent:  pptInfo.CoverContent,
 		PptUrl:        pptInfo.PptUrl,
 		PptxUrl:       pptInfo.PptxUrl,
 		CreateTime:    time.Now(),