瀏覽代碼

ppt 新增 中间页封底页

gmy 4 月之前
父節點
當前提交
753f907393
共有 2 個文件被更改,包括 46 次插入94 次删除
  1. 3 55
      controllers/ppt_v2.go
  2. 43 39
      models/ppt_v2.go

+ 3 - 55
controllers/ppt_v2.go

@@ -227,17 +227,7 @@ func (this *PptV2Controller) EditPpt() {
 		br.Msg = "标题不能为空"
 		return
 	}
-	//item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	//if err != nil && !utils.IsErrNoRow(err) {
-	//	br.Msg = "获取数据异常!"
-	//	br.ErrMsg = "获取数据异常,Err:" + err.Error()
-	//	return
-	//}
-	//if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
-	//	br.Msg = "标题已存在,不可重复添加"
-	//	br.IsSendEmail = false
-	//	return
-	//}
+
 	pptInfo, err := models.GetPptV2ById(int(req.PptId))
 	if err != nil {
 		br.Msg = "信息获取失败"
@@ -262,25 +252,11 @@ func (this *PptV2Controller) EditPpt() {
 		}
 	}
 
-	// 判断权限
-	//if pptInfo.AdminId != this.SysUser.AdminId {
-	//	_, err := models.GetPPtGrantConf(pptInfo.PptId, this.SysUser.AdminId)
-	//	if err != nil {
-	//		if utils.IsErrNoRow(err) {
-	//			br.Msg = `该PPT已取消共享,保存失败`
-	//			br.ErrMsg = `该PPT已取消共享,保存失败`
-	//			br.IsSendEmail = false
-	//		} else {
-	//			br.Msg = `保存失败`
-	//			br.ErrMsg = `保存失败,ERR:` + err.Error()
-	//		}
-	//		return
-	//	}
-	//}
-
 	// 修改
 	pptInfo.TemplateType = req.FirstPage.TemplateType
 	pptInfo.BackgroundImg = req.FirstPage.ImgUrl
+	pptInfo.CurrentBackgroundImg = req.FirstPage.CurrentBackgroundImg
+	pptInfo.BackCoverImg = req.FirstPage.BackCoverImg
 	pptInfo.Title = req.FirstPage.Title
 	pptInfo.ReportType = req.FirstPage.ReportType
 	pptInfo.PptDate = req.FirstPage.PptDate
@@ -295,34 +271,6 @@ func (this *PptV2Controller) EditPpt() {
 		return
 	}
 
-	//pptMap, err := models.GetPptMappingByPptId(req.PptId)
-	//if err != nil {
-	//	br.Msg = `该PPT信息不存在, 保存失败`
-	//	br.ErrMsg = `该PPT信息不存在, 保存失败, Err` + err.Error()
-	//	br.IsSendEmail = false
-	//	return
-	//}
-	//pptMapList, err := models.GetPptMappingListByGroupId(pptMap.GroupId)
-	//if err != nil {
-	//	br.ErrMsg = "PPT目录信息异常"
-	//	return
-	//}
-	//count, err := models.GetPptMappingByGroupPptCountId(pptMap.GroupPptId, this.SysUser.AdminId)
-	//if err != nil {
-	//	br.Msg = "查询映射关系失败"
-	//	br.ErrMsg = "查询映射关系失败, 保存失败, Err:" + err.Error()
-	//	return
-	//}
-	//if !pptMap.IsMoved && len(pptMapList) > 1 && count > 0 {
-	//	// 如果没有人为移动位置, 默认将当前ppt置顶
-	//	err = ppt.MoveGroupPpt(pptMap.GroupId, pptMap.GroupPptId, pptMapList[0].GroupPptId, 0, this.SysUser.AdminId)
-	//	if err != nil {
-	//		br.Msg = err.Error()
-	//		br.ErrMsg = "移动失败,Err:" + err.Error()
-	//		return
-	//	}
-	//}
-
 	// 日志记录
 	{
 		logInfo := &models.PptV2SaveLog{

+ 43 - 39
models/ppt_v2.go

@@ -12,39 +12,41 @@ import (
 
 // PptV2 表
 type PptV2 struct {
-	PptId            int       `gorm:"column:ppt_id;primaryKey;autoIncrement:true" description:"ppt的Id"`
-	TemplateType     int       `gorm:"column:template_type" description:"模版类型"`
-	BackgroundImg    string    `gorm:"column:background_img" description:"背景图片"`
-	Title            string    `gorm:"column:title" description:"标题"`
-	ReportType       string    `gorm:"column:report_type" description:"报告类型"`
-	PptDate          string    `gorm:"column:ppt_date" description:"选择日期"`
-	Content          string    `gorm:"column:content" description:"ppt内容"`
-	PptUrl           string    `gorm:"column:ppt_url" description:"ppt下载地址"`
-	PptxUrl          string    `gorm:"column:pptx_url" description:"pptx下载地址"`
-	CreateTime       time.Time `gorm:"column:create_time" description:"创建时间"`
-	ModifyTime       time.Time `gorm:"column:modify_time" description:"修改时间"`
-	AdminId          int       `gorm:"column:admin_id" description:"系统用户id"`
-	AdminRealName    string    `gorm:"column:admin_real_name" description:"系统用户名称"`
-	PptVersion       int8      `gorm:"column:ppt_version" description:"是否ppt的旧版本;1:旧的,2:新的"`
-	ReportId         int       `gorm:"column:report_id" description:"关联的报告ID"`
-	ReportCode       string    `gorm:"column:report_code" description:"关联的报告code"`
-	IsShare          int8      `gorm:"column:is_share" description:"是否分享,0:不分享,1:分享"`
-	PublishTime      time.Time `gorm:"column:publish_time" description:"发布时间"`
-	CoverContent     string    `gorm:"column:cover_content" description:"PPT内容-JSON"`
-	PptPage          int       `gorm:"column:ppt_page" description:"PPT页数"`
-	TitleSetting     string    `gorm:"column:title_setting" description:"PPT标题设置"`
-	ClassifyId       int       `gorm:"column:classify_id" description:"报告分类ID"`
-	AddType          int       `gorm:"column:add_type" description:"新增方式:1-新增报告;2-继承报告"`
-	InheritReportId  int       `gorm:"column:inherit_report_id" description:"继承的报告ID"`
-	CollaborateType  int       `gorm:"column:collaborate_type" description:"协作方式:1-个人;2-多人协作"`
-	CollaborateUsers string    `gorm:"column:collaborate_users" description:"协作人IDs, 英文逗号分隔"`
-	IsPublicPublish  int       `gorm:"column:is_public_publish" description:"是否公开发布:1-是;2-否"`
-	SubmitTime       time.Time `gorm:"column:submit_time" description:"提交时间"`
-	ApproveTime      time.Time `gorm:"column:approve_time" description:"审批时间"`
-	ReportSource     int       `gorm:"column:report_source" description:"报告来源:1-系统内;2-智力共享"`
-	OutReportId      string    `gorm:"column:out_report_id" description:"外部报告ID(或编码)"`
-	State            int       `gorm:"column:state" description:"报告状态:1-未发布;2-已发布;3-待提交;4-待审批;5-已驳回;6-已通过"`
-	TopicEndTime     time.Time `gorm:"column:topic_end_time" description:"课题结束时间"`
+	PptId                int       `gorm:"column:ppt_id;primaryKey;autoIncrement:true" description:"ppt的Id"`
+	TemplateType         int       `gorm:"column:template_type" description:"模版类型"`
+	BackgroundImg        string    `gorm:"column:background_img" description:"现在实际存的封面图(前端改动太大,不知道该字段之前谁定义的)"`
+	Title                string    `gorm:"column:title" description:"标题"`
+	ReportType           string    `gorm:"column:report_type" description:"报告类型"`
+	PptDate              string    `gorm:"column:ppt_date" description:"选择日期"`
+	Content              string    `gorm:"column:content" description:"ppt内容"`
+	PptUrl               string    `gorm:"column:ppt_url" description:"ppt下载地址"`
+	PptxUrl              string    `gorm:"column:pptx_url" description:"pptx下载地址"`
+	CreateTime           time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime           time.Time `gorm:"column:modify_time" description:"修改时间"`
+	AdminId              int       `gorm:"column:admin_id" description:"系统用户id"`
+	AdminRealName        string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	PptVersion           int8      `gorm:"column:ppt_version" description:"是否ppt的旧版本;1:旧的,2:新的"`
+	ReportId             int       `gorm:"column:report_id" description:"关联的报告ID"`
+	ReportCode           string    `gorm:"column:report_code" description:"关联的报告code"`
+	IsShare              int8      `gorm:"column:is_share" description:"是否分享,0:不分享,1:分享"`
+	PublishTime          time.Time `gorm:"column:publish_time" description:"发布时间"`
+	CoverContent         string    `gorm:"column:cover_content" description:"PPT内容-JSON"`
+	PptPage              int       `gorm:"column:ppt_page" description:"PPT页数"`
+	TitleSetting         string    `gorm:"column:title_setting" description:"PPT标题设置"`
+	ClassifyId           int       `gorm:"column:classify_id" description:"报告分类ID"`
+	AddType              int       `gorm:"column:add_type" description:"新增方式:1-新增报告;2-继承报告"`
+	InheritReportId      int       `gorm:"column:inherit_report_id" description:"继承的报告ID"`
+	CollaborateType      int       `gorm:"column:collaborate_type" description:"协作方式:1-个人;2-多人协作"`
+	CollaborateUsers     string    `gorm:"column:collaborate_users" description:"协作人IDs, 英文逗号分隔"`
+	IsPublicPublish      int       `gorm:"column:is_public_publish" description:"是否公开发布:1-是;2-否"`
+	SubmitTime           time.Time `gorm:"column:submit_time" description:"提交时间"`
+	ApproveTime          time.Time `gorm:"column:approve_time" description:"审批时间"`
+	ReportSource         int       `gorm:"column:report_source" description:"报告来源:1-系统内;2-智力共享"`
+	OutReportId          string    `gorm:"column:out_report_id" description:"外部报告ID(或编码)"`
+	State                int       `gorm:"column:state" description:"报告状态:1-未发布;2-已发布;3-待提交;4-待审批;5-已驳回;6-已通过"`
+	TopicEndTime         time.Time `gorm:"column:topic_end_time" description:"课题结束时间"`
+	CurrentBackgroundImg string    `gorm:"column:current_background_img " description:"背景图片"`
+	BackCoverImg         string    `gorm:"column:back_cover_img" description:"封底图片"`
 }
 
 type PptV2Item struct {
@@ -127,12 +129,14 @@ func DeletePptV2(pptId int) (err error) {
 type AddPptV2Req struct {
 	PptId     int64 `description:"ppt_id"`
 	FirstPage struct {
-		Title        string `description:"标题"`
-		ReportType   string `description:"类型"`
-		PptDate      string `description:"日期"`
-		ImgUrl       string `description:"图片"`
-		BackIndex    int    `description:"背景图片下标"`
-		TemplateType int    `description:"模版id"`
+		Title                string `description:"标题"`
+		ReportType           string `description:"类型"`
+		PptDate              string `description:"日期"`
+		ImgUrl               string `description:"封面图片"`
+		CurrentBackgroundImg string `description:"背景图片"`
+		BackCoverImg         string `description:"封底图片"`
+		BackIndex            int    `description:"背景图片下标"`
+		TemplateType         int    `description:"模版id"`
 	} `description:"首页"`
 	Content      string `description:"ppt的json数据"`
 	GroupId      int64  `description:"目录id"`