Merge branch 'bzq/knowledge_add_viewpoint' of eta_gn_server/eta_api into debug

controllers/ppt_v2.go

@@ -263,6 +263,8 @@ func (this *PptV2Controller) EditPpt() {
 	}
 
 	// 修改
+	pptInfo.Abstract = req.Abstract
+	pptInfo.CollaborateUsers = req.CollaborateUsers
 	pptInfo.TemplateType = req.FirstPage.TemplateType
 	pptInfo.BackgroundImg = req.FirstPage.ImgUrl
 	pptInfo.CurrentBackgroundImg = req.FirstPage.CurrentBackgroundImg
@@ -277,7 +279,7 @@ func (this *PptV2Controller) EditPpt() {
 	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
 	pptInfo.TitleSetting = req.TitleSetting
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "CurrentBackgroundImg", "BackCoverImg", "CurrentBackgroundImgId", "BackCoverImgId", "BackgroundImgId", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
+	err = pptInfo.Update([]string{"Abstract", "CollaborateUsers", "TemplateType", "BackgroundImg", "CurrentBackgroundImg", "BackCoverImg", "CurrentBackgroundImgId", "BackCoverImgId", "BackgroundImgId", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -842,6 +844,7 @@ func (this *PptV2Controller) SaveLog() {
 			return
 		}
 	}
+	pptItem.Abstract = req.Abstract
 	pptItem.TemplateType = req.FirstPage.TemplateType
 	pptItem.BackgroundImg = req.FirstPage.ImgUrl
 	pptItem.CurrentBackgroundImg = req.FirstPage.CurrentBackgroundImg

models/ppt_v2.go

@@ -145,10 +145,12 @@ type AddPptV2Req struct {
 		BackIndex              int    `description:"背景图片下标"`
 		TemplateType           int    `description:"模版id"`
 	} `description:"首页"`
-	Content      string `description:"ppt的json数据"`
+	Abstract         string `description:"摘要"`
-	GroupId      int64  `description:"目录id"`
+	CollaborateUsers string `description:"协作人IDs, 英文逗号分隔"`
-	CoverContent string `description:"封面图内容-JSON数据"`
+	Content          string `description:"ppt的json数据"`
-	TitleSetting string `description:"PPT标题设置"`
+	GroupId          int64  `description:"目录id"`
+	CoverContent     string `description:"封面图内容-JSON数据"`
+	TitleSetting     string `description:"PPT标题设置"`
 }
 
 type AddPptResp struct {