Przeglądaj źródła

Merge branch 'aj_ppt' into custom

hongze 8 miesięcy temu
rodzic
commit
ec3078ea34

+ 1 - 0
controllers/ppt_v2.go

@@ -1081,6 +1081,7 @@ func (this *PptV2Controller) ToEn() {
 		ModifyTime:    time.Now(),
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
+		TitleSetting:  origin.TitleSetting,
 	}
 	newId, e = ppt_english.AddPptEnglish(pptInfo)
 	if e != nil {

+ 1 - 0
models/ppt_english/ppt_english_group.go

@@ -211,6 +211,7 @@ type RespGroupPptNameListItem struct {
 	PptPage       int    `description:"PPT总页数"`
 	IsReceived    int8   `description:"是否收到的共享,0:不是,1:是"`
 	IsGrant       int8   `description:"是否分配了权限,0:不是,1:是"`
+	TitleSetting  string `description:"PPT标题设置"`
 }
 
 type RespGroupPptListItem struct {

+ 1 - 0
models/ppt_v2_group.go

@@ -211,6 +211,7 @@ type RespGroupPptNameListItem struct {
 	PptPage       int    `description:"PPT总页数"`
 	IsReceived    int8   `description:"是否收到的共享,0:不是,1:是"`
 	IsGrant       int8   `description:"是否分配了权限,0:不是,1:是"`
+	TitleSetting  string `description:"PPT标题设置"`
 }
 
 type RespGroupPptListItem struct {

+ 3 - 0
services/ppt/ppt_english_group.go

@@ -214,6 +214,7 @@ func CopyEnglishGroup(groupId int64, adminId int, adminRealName string) (err err
 			ModifyTime:    time.Now(),
 			AdminId:       adminId,
 			AdminRealName: adminRealName,
+			TitleSetting:  v.TitleSetting,
 		}
 		newPptList = append(newPptList, tmp)
 	}
@@ -740,6 +741,7 @@ func CopyPptEnglish(pptId int, groupId int64, adminId int, adminRealName string)
 		ModifyTime:    time.Now(),
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
+		TitleSetting:  pptInfo.TitleSetting,
 	}
 	newPptList = append(newPptList, newPpt)
 
@@ -787,6 +789,7 @@ func CopyPptEnglish(pptId int, groupId int64, adminId int, adminRealName string)
 		AdminRealName: newPpt.AdminRealName,
 		PptCreateTime: newPpt.CreateTime.Format(utils.FormatDateTime),
 		PptPage:       pptPage,
+		TitleSetting:  newPpt.TitleSetting,
 	}
 	return
 }

+ 3 - 0
services/ppt/ppt_group.go

@@ -385,6 +385,7 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 			AdminId:       adminId,
 			AdminRealName: adminRealName,
 			PptVersion:    v.PptVersion,
+			TitleSetting:  v.TitleSetting,
 		}
 		newPptList = append(newPptList, tmp)
 	}
@@ -945,6 +946,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
 		PptVersion:    pptInfo.PptVersion,
+		TitleSetting:  pptInfo.TitleSetting,
 	}
 	newPptList = append(newPptList, newPpt)
 
@@ -997,6 +999,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		ReportCode:    newPpt.ReportCode,
 		PptCreateTime: newPpt.CreateTime.Format(utils.FormatDateTime),
 		PptPage:       pptPage,
+		TitleSetting:  newPpt.TitleSetting,
 	}
 	return
 }