Explorar el Código

新增PPT标题设置

hongze hace 10 meses
padre
commit
6abd4f4926
Se han modificado 4 ficheros con 26 adiciones y 9 borrados
  1. 8 4
      controllers/ppt_english.go
  2. 10 5
      controllers/ppt_v2.go
  3. 4 0
      models/ppt_english/ppt_english.go
  4. 4 0
      models/ppt_v2.go

+ 8 - 4
controllers/ppt_english.go

@@ -175,6 +175,7 @@ func (this *PptEnglishController) AddPpt() {
 			ModifyTime:    time.Now(),
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
+			TitleSetting:  req.TitleSetting,
 		}
 		newId, err = ppt_english.AddPptEnglish(pptInfo)
 		if err != nil {
@@ -207,9 +208,8 @@ func (this *PptEnglishController) AddPpt() {
 		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
 		pptInfo.PptPage = len(pptContent)
-
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
-
+		pptInfo.TitleSetting = req.TitleSetting
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page", "TitleSetting"})
 		msg = "保存成功"
 	}
 	resp := ppt_english.AddPptEnglishResp{
@@ -297,7 +297,9 @@ func (this *PptEnglishController) EditPpt() {
 	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
 	pptInfo.PptPage = len(pptContent)
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+
+	pptInfo.TitleSetting = req.TitleSetting
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page", "TitleSetting"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -346,6 +348,7 @@ func (this *PptEnglishController) EditPpt() {
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
 			CreateTime:    time.Now(),
+			TitleSetting:  req.TitleSetting,
 		}
 		_, err = ppt_english.AddPptEnglishSaveLog(logInfo)
 	}
@@ -809,6 +812,7 @@ func (this *PptEnglishController) SaveLog() {
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),
+		TitleSetting:  req.TitleSetting,
 	}
 	_, err = ppt_english.AddPptEnglishSaveLog(logInfo)
 	if err != nil {

+ 10 - 5
controllers/ppt_v2.go

@@ -178,6 +178,7 @@ func (this *PptV2Controller) AddPpt() {
 			AdminRealName: this.SysUser.RealName,
 			PptVersion:    2,
 			PptPage:       len(pptContent),
+			TitleSetting:  req.TitleSetting,
 		}
 		newId, err = models.AddPptV2(pptInfo)
 		if err != nil {
@@ -210,9 +211,8 @@ func (this *PptV2Controller) AddPpt() {
 		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
 		pptInfo.PptPage = len(pptContent)
-
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
-
+		pptInfo.TitleSetting = req.TitleSetting
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page", "TitleSetting"})
 		msg = "保存成功"
 	}
 	resp := models.AddPptResp{
@@ -300,7 +300,9 @@ func (this *PptV2Controller) EditPpt() {
 	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
 	pptInfo.PptPage = len(pptContent)
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+
+	pptInfo.TitleSetting = req.TitleSetting
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page", "TitleSetting"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -738,7 +740,9 @@ func (this *PptV2Controller) SaveLog() {
 	pptItem.Content = req.Content
 	pptItem.ModifyTime = time.Now()
 	pptItem.PptPage = len(pptContent)
-	err = pptItem.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "ppt_page"})
+	pptItem.TitleSetting = req.TitleSetting
+
+	err = pptItem.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "ppt_page", "TitleSetting"})
 
 	// 将更新后的PPT, 置顶
 	pptMap, err := models.GetPptMappingByPptId(int64(req.PptId))
@@ -782,6 +786,7 @@ func (this *PptV2Controller) SaveLog() {
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),
+		TitleSetting:  req.TitleSetting,
 	}
 	_, e = models.AddPptV2SaveLog(logInfo)
 	if e != nil {

+ 4 - 0
models/ppt_english/ppt_english.go

@@ -27,6 +27,7 @@ type PptEnglish struct {
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
 	PptPage       int       `description:"PPT正文页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 type PptEnglishItem struct {
@@ -49,6 +50,7 @@ type PptEnglishItem struct {
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
 	PptPage       int       `description:"PPT正文页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 func GetPptEnglishList(condition string, pars []interface{}, startSize, pageSize int) (items []*PptEnglishItem, err error) {
@@ -120,6 +122,7 @@ type AddPptEnglishReq struct {
 	Content      string `description:"ppt的json数据"`
 	GroupId      int64  `description:"目录id"`
 	CoverContent string `description:"PPT内容-JSON"`
+	TitleSetting string `description:"PPT标题设置"`
 }
 
 type AddPptEnglishResp struct {
@@ -256,6 +259,7 @@ type PptEnglishSaveLog struct {
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 // AddPptEnglishSaveLog 新增PPT日志

+ 4 - 0
models/ppt_v2.go

@@ -30,6 +30,7 @@ type PptV2 struct {
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
 	PptPage       int       `description:"PPT的总页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 type PptV2Item struct {
@@ -54,6 +55,7 @@ type PptV2Item struct {
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
 	PptPage       int       `description:"PPT的总页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int) (items []*PptV2Item, err error) {
@@ -125,6 +127,7 @@ type AddPptV2Req struct {
 	Content      string `description:"ppt的json数据"`
 	GroupId      int64  `description:"目录id"`
 	CoverContent string `description:"封面图内容-JSON数据"`
+	TitleSetting string `description:"PPT标题设置"`
 }
 
 type AddPptResp struct {
@@ -207,6 +210,7 @@ type PptV2SaveLog struct {
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 // AddPptV2SaveLog 新增PPT日志