合并PPT

controllers/ppt_report.go

@@ -279,9 +279,7 @@ func (this *PptV2Controller) CreateReport() {
 		return
 	}
 	if req.AddType != 1 && req.AddType != 2 {
-		br.Msg = "新增方式异常"
-		br.ErrMsg = fmt.Sprintf("新增方式异常, %d", req.AddType)
-		return
+		req.AddType = 1
 	}
 	if req.ClassifyId <= 0 {
 		br.Msg = "请选择分类"
@@ -338,6 +336,18 @@ func (this *PptV2Controller) CreateReport() {
 		newItem.CoverContent = inheritPpt.CoverContent
 		newItem.TitleSetting = inheritPpt.TitleSetting
 	}
+
+	// 非继承PPT，有内容时写入内容(如合并PPT时)
+	if req.InheritPptId <= 0 {
+		newItem.TemplateType = req.FirstPage.TemplateType
+		newItem.BackgroundImg = req.FirstPage.ImgUrl
+		newItem.ReportType = req.FirstPage.ReportType
+		newItem.PptDate = req.FirstPage.PptDate
+		newItem.Content = req.Content
+		newItem.CoverContent = req.CoverContent
+		newItem.TitleSetting = req.TitleSetting
+	}
+
 	newId, e := models.AddPptV2(newItem)
 	if e != nil {
 		br.Msg = "操作失败"

models/ppt_v2.go

@@ -438,4 +438,15 @@ type PptReportCreateReq struct {
 	InheritPptId       int    `description:"待继承的报告ID"`
 	CollaborateType    int    `description:"协作方式，1：个人，2：多人协作。默认：1"`
 	CollaborateUserIds []int  `description:"协作人IDs"`
+	FirstPage          struct {
+		Title        string `description:"标题"`
+		ReportType   string `description:"类型"`
+		PptDate      string `description:"日期"`
+		ImgUrl       string `description:"图片"`
+		BackIndex    int    `description:"背景图片下标"`
+		TemplateType int    `description:"模版id"`
+	} `description:"首页"`
+	Content      string `description:"ppt的json数据"`
+	CoverContent string `description:"封面图内容-JSON数据"`
+	TitleSetting string `description:"PPT标题设置"`
 }