自由布局新增比例字段

controllers/report_v2.go

@@ -479,6 +479,7 @@ func (this *ReportController) Add() {
 	item.AdminRealName = sysUser.RealName
 	item.ClassifyIdThird = req.ClassifyIdThird
 	item.ClassifyNameThird = classifyMap[req.ClassifyIdThird]
+	item.FreeReportRatio = req.FreeReportRatio
 
 	// 产品要求，如果是多人协作，那么就是章节类型的报告
 	if req.CollaborateType == 2 {

models/report.go

@@ -93,6 +93,7 @@ type Report struct {
 	VoiceGenerateType   int       `description:"音频生成方式，0：系统生成，1：人工上传"`
 	RaiReportId         int       `description:"RAI报告ID"`
 	FreeLayoutConfig    string    `description:"'自由布局配置"`
+	FreeReportRatio     string    `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 func (m *Report) AfterFind(db *gorm.DB) (err error) {
@@ -171,6 +172,7 @@ type ReportList struct {
 	ClassifyNameThird   string    `description:"三级分类名称"`
 	InheritReportId     int       `description:"待继承的报告ID"`
 	RaiReportId         int       `description:"RAI报告ID"`
+	FreeReportRatio     string    `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 func (m *ReportList) AfterFind(db *gorm.DB) (err error) {
@@ -450,6 +452,7 @@ type ReportDetail struct {
 	ReportCreateTime    time.Time `description:"报告时间创建时间"`
 	RaiReportId         int       `description:"RAI报告ID"`
 	FreeLayoutConfig    string    `description:"'自由布局配置"`
+	FreeReportRatio     string    `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 func (m *ReportDetail) AfterFind(db *gorm.DB) (err error) {
@@ -622,6 +625,7 @@ type AddReq struct {
 	IsPublicPublish    int8   `description:"是否公开发布，1：是，2：否"`
 	InheritReportId    int    `description:"待继承的报告ID"`
 	GrantAdminIdList   []int  `description:"授权用户id列表"`
+	FreeReportRatio    string `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 type PrePublishReq struct {
@@ -670,8 +674,9 @@ type EditReq struct {
 	EndResourceId      int    `description:"版尾资源ID"`
 	//CollaborateType    int8   `description:"协作方式，1：个人，2：多人协作。默认：1"`
 	//ReportLayout       int8   `description:"报告布局，1：常规布局，2：智能布局，3：自由布局。默认：1"`
-	IsPublicPublish  int8  `description:"是否公开发布，1：是，2：否"`
-	GrantAdminIdList []int `description:"授权用户id列表"`
+	IsPublicPublish  int8   `description:"是否公开发布，1：是，2：否"`
+	GrantAdminIdList []int  `description:"授权用户id列表"`
+	FreeReportRatio  string `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 type EditResp struct {
@@ -1717,7 +1722,7 @@ func InsertOrUpdateReportFreeLayoutContentPage(reportInfo *Report, ormList []*re
 		}
 		_ = tx.Commit()
 	}()
-	reportUpdateCols := []string{"Content", "ContentSub", "ContentStruct", "HeadImg", "EndImg", "CanvasColor", "HeadResourceId", "EndResourceId", "ModifyTime", "ContentModifyTime","FreeLayoutConfig"}
+	reportUpdateCols := []string{"Content", "ContentSub", "ContentStruct", "HeadImg", "EndImg", "CanvasColor", "HeadResourceId", "EndResourceId", "ModifyTime", "ContentModifyTime", "FreeLayoutConfig"}
 	err = tx.Model(&reportInfo).Select(reportUpdateCols).Updates(reportInfo).Error
 	return report.BatchInsertOrUpdatePages(tx, ormList, false, reportInfo.Id, 0)
 }
@@ -1731,7 +1736,7 @@ func UpdateChapterFreeLayoutContentPage(reportInfo *Report, chapterInfo *ReportC
 		_ = tx.Commit()
 	}()
 
-	if err = tx.Model(&reportInfo).Select([]string{"LastModifyAdminId", "LastModifyAdminName", "ModifyTime","FreeLayoutConfig"}).Updates(reportInfo).Error; err != nil {
+	if err = tx.Model(&reportInfo).Select([]string{"LastModifyAdminId", "LastModifyAdminName", "ModifyTime", "FreeLayoutConfig"}).Updates(reportInfo).Error; err != nil {
 		return
 	}
 	// 更新章节

services/report_v2.go

@@ -97,7 +97,7 @@ func AddReportAndChapter(reportInfo *models.Report, inheritReportId int, grantAd
 			reportInfo.HeadImg = ``
 			reportInfo.EndImg = ``
 			reportInfo.EndResourceId = inheritReport.EndResourceId
-			reportInfo.FreeLayoutConfig= inheritReport.FreeLayoutConfig
+			reportInfo.FreeLayoutConfig = inheritReport.FreeLayoutConfig
 			if inheritReport.HeadResourceId > 0 {
 				reportInfo.HeadImg = inheritReport.HeadImg
 			}
@@ -228,7 +228,7 @@ func EditReport(reportInfo *models.Report, req models.EditReq, sysUser *system.A
 	reportInfo.State = state
 
 	//updateCols := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "ClassifyIdThird", "ClassifyNameThird", "Title", "Abstract", "Author", "Frequency", "Stage", "CreateTime", "IsPublicPublish", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime"}
-	updateCols := []string{"Title", "Abstract", "Author", "Frequency", "CreateTime", "IsPublicPublish", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime", "State"}
+	updateCols := []string{"Title", "Abstract", "Author", "Frequency", "CreateTime", "IsPublicPublish", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime", "State", "FreeReportRatio"}
 
 	if req.HeadResourceId > 0 {
 		reportInfo.HeadResourceId = req.HeadResourceId
@@ -238,6 +238,7 @@ func EditReport(reportInfo *models.Report, req models.EditReq, sysUser *system.A
 		reportInfo.EndResourceId = req.EndResourceId
 		updateCols = append(updateCols, "EndResourceId")
 	}
+	reportInfo.FreeReportRatio = req.FreeReportRatio
 
 	// 需要添加的报告授权数据
 	addReportAdminList := make([]*report.ReportGrant, 0)