Merge remote-tracking branch 'origin/master'

controllers/data_source/guagnzhouqihuo.go

@@ -13,6 +13,7 @@ import (
 	"time"
 )
 
+// 广州期货交易所
 type DataSourceController struct {
 	controllers.BaseAuthController
 }

controllers/ppt_english.go

@@ -92,16 +92,6 @@ func (this *PptEnglishController) ListPpt() {
 		} else {
 			list[i].IsAuth = false
 		}
-		if list[i].PptPage == 0 {
-			var pptContent []services.PPTContent
-			er := json.Unmarshal([]byte(list[i].Content), &pptContent)
-			if er != nil {
-				br.Msg = "content参数解析失败"
-				br.ErrMsg = "content参数解析失败, Err:" + er.Error()
-				return
-			}
-			list[i].PptPage = len(pptContent)
-		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(ppt_english.PptEnglishListResp)
@@ -136,13 +126,6 @@ func (this *PptEnglishController) AddPpt() {
 		br.Msg = "标题不能为空"
 		return
 	}
-	var pptContent []services.PPTContent
-	err = json.Unmarshal([]byte(req.Content), &pptContent)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
 
 	var newId int64
 	var msg string
@@ -175,6 +158,7 @@ func (this *PptEnglishController) AddPpt() {
 			ModifyTime:    time.Now(),
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
+			TitleSetting:  req.TitleSetting,
 		}
 		newId, err = ppt_english.AddPptEnglish(pptInfo)
 		if err != nil {
@@ -206,9 +190,8 @@ func (this *PptEnglishController) AddPpt() {
 		pptInfo.Content = req.Content
 		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
-		pptInfo.PptPage = len(pptContent)
-
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+		pptInfo.TitleSetting = req.TitleSetting
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
 
 		msg = "保存成功"
 	}
@@ -240,15 +223,6 @@ func (this *PptEnglishController) EditPpt() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-
-	var pptContent []services.PPTContent
-	err = json.Unmarshal([]byte(req.Content), &pptContent)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
 	if req.FirstPage.Title == "" {
 		br.Msg = "标题不能为空"
 		return
@@ -296,8 +270,8 @@ func (this *PptEnglishController) EditPpt() {
 	pptInfo.Content = req.Content
 	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
-	pptInfo.PptPage = len(pptContent)
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+	pptInfo.TitleSetting = req.TitleSetting
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -346,6 +320,7 @@ func (this *PptEnglishController) EditPpt() {
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
 			CreateTime:    time.Now(),
+			TitleSetting:  req.TitleSetting,
 		}
 		_, err = ppt_english.AddPptEnglishSaveLog(logInfo)
 	}
@@ -525,29 +500,6 @@ func (this *PptEnglishController) Publish() {
 		br.ErrMsg = "发布失败，Err:" + err.Error()
 		return
 	}
-
-	pptMap, err := ppt_english.GetPptMappingByPptId(int64(req.PptId))
-	if err != nil {
-		br.Msg = `该PPT信息不存在, 保存失败`
-		br.ErrMsg = `该PPT信息不存在, 保存失败, Err` + err.Error()
-		br.IsSendEmail = false
-		return
-	}
-	pptMapList, err := ppt_english.GetPptMappingListByGroupIdDesc(pptMap.GroupId)
-	if err != nil {
-		br.ErrMsg = "PPT目录信息异常"
-		return
-	}
-	if !pptMap.IsMoved && len(pptMapList) > 1 {
-		// 如果没有人为移动位置, 默认将当前ppt置顶
-		err = ppt.MoveGroupPptEnglish(pptMap.GroupId, pptMap.GroupPptId, pptMapList[0].GroupPptId, 0, this.SysUser.AdminId)
-		if err != nil {
-			br.Msg = err.Error()
-			br.ErrMsg = "移动失败,Err:" + err.Error()
-			return
-		}
-	}
-
 	//添加发布记录
 	{
 		record := new(ppt_english.PptEnglishPublishRecord)
@@ -715,7 +667,6 @@ func (this *PptEnglishController) SaveLog() {
 		br.Msg = "标题不能为空"
 		return
 	}
-
 	var pageContent []services.PPTContent
 	err = json.Unmarshal([]byte(req.Content), &pageContent)
 	if err != nil {
@@ -723,6 +674,7 @@ func (this *PptEnglishController) SaveLog() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
+
 	// 获取ppt
 	item, err := ppt_english.GetPptEnglishByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -809,6 +761,7 @@ func (this *PptEnglishController) SaveLog() {
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),
+		TitleSetting:  req.TitleSetting,
 	}
 	_, err = ppt_english.AddPptEnglishSaveLog(logInfo)
 	if err != nil {

controllers/ppt_english_group.go

@@ -301,17 +301,7 @@ func (this *PptEnglishGroupController) MoveGroupPpt() {
 		br.Msg = "请输入目录ID"
 		return
 	}
-	// 由于是倒序, 所以需要颠倒NextGroupPptId和PrevGroupPptId的位置
-	err = ppt.MoveGroupPptEnglish(req.GroupId, req.GroupPptId, req.NextGroupPptId, req.PrevGroupPptId, this.SysUser.AdminId)
-	if err != nil {
-		br.Msg = err.Error()
-		return
-	}
-	// 增加人为移动的标识
-	mappingInfo := &ppt_english.PptEnglishGroupMapping{}
-	mappingInfo.GroupPptId = req.GroupPptId
-	mappingInfo.IsMoved = true
-	err = mappingInfo.Update([]string{"is_moved"})
+	err = ppt.MoveGroupPptEnglish(req.GroupId, req.GroupPptId, req.PrevGroupPptId, req.NextGroupPptId, this.SysUser.AdminId)
 	if err != nil {
 		br.Msg = err.Error()
 		return

controllers/ppt_v2.go

@@ -92,16 +92,6 @@ func (this *PptV2Controller) ListPpt() {
 		} else {
 			list[i].IsAuth = false
 		}
-		if list[i].PptPage == 0 {
-			var pptContent []services.PPTContent
-			er := json.Unmarshal([]byte(list[i].Content), &pptContent)
-			if er != nil {
-				br.Msg = "content参数解析失败"
-				br.ErrMsg = "content参数解析失败, Err:" + er.Error()
-				return
-			}
-			list[i].PptPage = len(pptContent)
-		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(models.PptV2ListResp)
@@ -137,14 +127,6 @@ func (this *PptV2Controller) AddPpt() {
 		return
 	}
 
-	var pptContent []services.PPTContent
-	err = json.Unmarshal([]byte(req.Content), &pptContent)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
 	var newId int64
 	var msg string
 	if req.PptId <= 0 {
@@ -177,7 +159,7 @@ func (this *PptV2Controller) AddPpt() {
 			AdminId:       this.SysUser.AdminId,
 			AdminRealName: this.SysUser.RealName,
 			PptVersion:    2,
-			PptPage:       len(pptContent),
+			TitleSetting:  req.TitleSetting,
 		}
 		newId, err = models.AddPptV2(pptInfo)
 		if err != nil {
@@ -209,9 +191,8 @@ func (this *PptV2Controller) AddPpt() {
 		pptInfo.Content = req.Content
 		pptInfo.CoverContent = req.CoverContent
 		pptInfo.ModifyTime = time.Now()
-		pptInfo.PptPage = len(pptContent)
-
-		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+		pptInfo.TitleSetting = req.TitleSetting
+		err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
 
 		msg = "保存成功"
 	}
@@ -247,15 +228,6 @@ func (this *PptV2Controller) EditPpt() {
 		br.Msg = "标题不能为空"
 		return
 	}
-
-	var pptContent []services.PPTContent
-	err = json.Unmarshal([]byte(req.Content), &pptContent)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
 	item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取数据异常！"
@@ -299,8 +271,8 @@ func (this *PptV2Controller) EditPpt() {
 	pptInfo.Content = req.Content
 	pptInfo.CoverContent = req.CoverContent
 	pptInfo.ModifyTime = time.Now()
-	pptInfo.PptPage = len(pptContent)
-	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "ppt_page"})
+	pptInfo.TitleSetting = req.TitleSetting
+	err = pptInfo.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "CoverContent", "TitleSetting"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -528,29 +500,6 @@ func (this *PptV2Controller) Publish() {
 		br.ErrMsg = "发布失败，Err:" + err.Error()
 		return
 	}
-
-	pptMap, err := models.GetPptMappingByPptId(int64(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
-	}
-	if !pptMap.IsMoved && len(pptMapList) > 1 {
-		// 如果没有人为移动位置, 默认将当前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
-		}
-	}
-
 	//添加发布记录
 	{
 		record := new(models.PptV2PublishRecord)
@@ -737,8 +686,9 @@ func (this *PptV2Controller) SaveLog() {
 	pptItem.PptDate = req.FirstPage.PptDate
 	pptItem.Content = req.Content
 	pptItem.ModifyTime = time.Now()
+	pptItem.TitleSetting = req.TitleSetting
 	pptItem.PptPage = len(pptContent)
-	err = pptItem.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "ppt_page"})
+	err = pptItem.Update([]string{"TemplateType", "BackgroundImg", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "TitleSetting", "ppt_page"})
 
 	// 将更新后的PPT, 置顶
 	pptMap, err := models.GetPptMappingByPptId(int64(req.PptId))
@@ -782,6 +732,7 @@ func (this *PptV2Controller) SaveLog() {
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
 		CreateTime:    time.Now(),
+		TitleSetting:  req.TitleSetting,
 	}
 	_, e = models.AddPptV2SaveLog(logInfo)
 	if e != nil {
@@ -1130,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 {

controllers/ppt_v2_group.go

@@ -303,17 +303,7 @@ func (this *PptV2GroupController) MoveGroupPpt() {
 		br.Msg = "请输入目录ID"
 		return
 	}
-	// 由于是倒序, 所以需要颠倒NextGroupPptId和PrevGroupPptId的位置
-	err = ppt.MoveGroupPpt(req.GroupId, req.GroupPptId, req.NextGroupPptId, req.PrevGroupPptId, this.SysUser.AdminId)
-	if err != nil {
-		br.Msg = err.Error()
-		return
-	}
-	// 增加人为移动的标识
-	mappingInfo := &models.PptV2GroupMapping{}
-	mappingInfo.GroupPptId = req.GroupPptId
-	mappingInfo.IsMoved = true
-	err = mappingInfo.Update([]string{"is_moved"})
+	err = ppt.MoveGroupPpt(req.GroupId, req.GroupPptId, req.PrevGroupPptId, req.NextGroupPptId, this.SysUser.AdminId)
 	if err != nil {
 		br.Msg = err.Error()
 		return

controllers/sys_admin.go

@@ -12,11 +12,10 @@ import (
 	etaTrialService "eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // 系统用户
@@ -738,55 +737,32 @@ func (this *SysAdminController) Edit() {
 		}
 	}
 
-	if adminInfo.RoleName == "admin" && adminInfo.RealName == "admin" {
-		adminInfo.LastUpdatedTime = time.Now().Format(utils.FormatDateTime)
-		adminInfo.Mobile = req.Mobile
-		adminInfo.Position = req.Position
-		adminInfo.Province = req.Province
-		adminInfo.ProvinceCode = req.ProvinceCode
-		adminInfo.City = req.City
-		adminInfo.CityCode = req.CityCode
-		adminInfo.EmployeeId = req.EmployeeId
-		adminInfo.Email = req.Email
-		adminInfo.TelAreaCode = req.TelAreaCode
-		adminInfo.IsLdap = req.IsLdap
-		cols := []string{
-			"LastUpdatedTime", "Mobile", "Position", "Province", "ProvinceCode",
-			"City", "CityCode", "EmployeeId", "Email", "TelAreaCode", "IsLdap",
-		}
-		if e := adminInfo.Update(cols); e != nil {
-			br.Msg = "编辑失败"
-			br.ErrMsg = "更新用户信息失败, Err:" + e.Error()
-			return
-		}
-	} else {
-		adminInfo.AdminName = req.AdminName
-		adminInfo.RealName = req.RealName
-		adminInfo.LastUpdatedTime = time.Now().Format(utils.FormatDateTime)
-		adminInfo.Mobile = req.Mobile
-		adminInfo.RoleId = req.RoleId
-		adminInfo.RoleName = roleName
-		adminInfo.Enabled = req.Enabled
-		adminInfo.Authority = authority
-		adminInfo.Position = req.Position
-		adminInfo.RoleTypeCode = roleItem.RoleTypeCode
-		adminInfo.Province = req.Province
-		adminInfo.ProvinceCode = req.ProvinceCode
-		adminInfo.City = req.City
-		adminInfo.CityCode = req.CityCode
-		adminInfo.EmployeeId = req.EmployeeId
-		adminInfo.Email = req.Email
-		adminInfo.TelAreaCode = req.TelAreaCode
-		adminInfo.IsLdap = req.IsLdap
-		cols := []string{
-			"AdminName", "RealName", "LastUpdatedTime", "Mobile", "RoleId", "RoleName", "Enabled", "Authority",
-			"Position", "RoleTypeCode", "Province", "ProvinceCode", "City", "CityCode", "EmployeeId", "Email", "TelAreaCode", "IsLdap",
-		}
-		if e := adminInfo.Update(cols); e != nil {
-			br.Msg = "编辑失败"
-			br.ErrMsg = "更新用户信息失败, Err:" + e.Error()
-			return
-		}
+	adminInfo.AdminName = req.AdminName
+	adminInfo.RealName = req.RealName
+	adminInfo.LastUpdatedTime = time.Now().Format(utils.FormatDateTime)
+	adminInfo.Mobile = req.Mobile
+	adminInfo.RoleId = req.RoleId
+	adminInfo.RoleName = roleName
+	adminInfo.Enabled = req.Enabled
+	adminInfo.Authority = authority
+	adminInfo.Position = req.Position
+	adminInfo.RoleTypeCode = roleItem.RoleTypeCode
+	adminInfo.Province = req.Province
+	adminInfo.ProvinceCode = req.ProvinceCode
+	adminInfo.City = req.City
+	adminInfo.CityCode = req.CityCode
+	adminInfo.EmployeeId = req.EmployeeId
+	adminInfo.Email = req.Email
+	adminInfo.TelAreaCode = req.TelAreaCode
+	adminInfo.IsLdap = req.IsLdap
+	cols := []string{
+		"AdminName", "RealName", "LastUpdatedTime", "Mobile", "RoleId", "RoleName", "Enabled", "Authority",
+		"Position", "RoleTypeCode", "Province", "ProvinceCode", "City", "CityCode", "EmployeeId", "Email", "TelAreaCode", "IsLdap",
+	}
+	if e := adminInfo.Update(cols); e != nil {
+		br.Msg = "编辑失败"
+		br.ErrMsg = "更新用户信息失败, Err:" + e.Error()
+		return
 	}
 
 	// 同步用户缓存
@@ -855,10 +831,6 @@ func (this *SysAdminController) EditEnabled() {
 		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
 		return
 	}
-	if adminItem.RoleName == "admin" && adminItem.RealName == "admin" {
-		br.Msg = "禁止对admin使用<禁用>功能"
-		return
-	}
 
 	if req.Enabled == 0 {
 		//禁用

controllers/sys_role.go

@@ -7,11 +7,10 @@ import (
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type SysRoleController struct {
@@ -114,11 +113,6 @@ func (this *SysRoleController) Edit() {
 		br.Msg = "角色不存在, 请刷新页面"
 		return
 	}
-	// 不允许编辑admin用户
-	if item.RoleName == "admin" {
-		br.Msg = "admin用户不可编辑"
-		return
-	}
 	exists, e := system.GetSysRoleByName(req.RoleName)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		br.Msg = "操作失败"
@@ -185,10 +179,6 @@ func (this *SysRoleController) Delete() {
 		br.ErrMsg = "获取角色信息失败, Err: " + e.Error()
 		return
 	}
-	if role.RoleName == "admin" {
-		br.Msg = "admin用户不可删除"
-		return
-	}
 
 	err = system.DeleteSysRole(req.RoleId)
 	if err != nil {
@@ -525,16 +515,6 @@ func (this *SysRoleController) SysRoleMenuAuthList() {
 		}
 	}
 
-	sysRole, err := system.GetSysRoleById(roleId)
-	if err == nil {
-		if sysRole.RoleName == "admin" {
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "获取成功"
-			return
-		}
-	}
-
 	order := `sort ASC, create_time DESC, menu_id DESC`
 	list, e := system.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, order)
 	if e != nil {

models/ppt_english/ppt_english.go

@@ -26,7 +26,8 @@ type PptEnglish struct {
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT正文页数"`
+	PptPage       int       `description:"PPT页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 type PptEnglishItem struct {
@@ -48,7 +49,7 @@ type PptEnglishItem struct {
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT正文页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 func GetPptEnglishList(condition string, pars []interface{}, startSize, pageSize int) (items []*PptEnglishItem, err error) {
@@ -120,6 +121,7 @@ type AddPptEnglishReq struct {
 	Content      string `description:"ppt的json数据"`
 	GroupId      int64  `description:"目录id"`
 	CoverContent string `description:"PPT内容-JSON"`
+	TitleSetting string `description:"PPT标题设置"`
 }
 
 type AddPptEnglishResp struct {
@@ -256,6 +258,7 @@ type PptEnglishSaveLog struct {
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 // AddPptEnglishSaveLog 新增PPT日志

models/ppt_english/ppt_english_grant.go

@@ -1,9 +1,8 @@
 package ppt_english
 
 import (
-	"time"
-
 	"github.com/beego/beego/v2/client/orm"
+	"time"
 )
 
 // PptEnglishGrant Ppt授权表
@@ -99,7 +98,6 @@ type PptEnglishInfoGrantItem struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
-	PptPage       int       `description:"PPT总页数"`
 	//GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
 	//PptId        int64     `description:"ppt ID"`
 	//DepartmentId int64     `description:"授权部门id"`

models/ppt_english/ppt_english_group.go

@@ -1,9 +1,8 @@
 package ppt_english
 
 import (
-	"time"
-
 	"github.com/beego/beego/v2/client/orm"
+	"time"
 )
 
 type PptEnglishGroup struct {
@@ -212,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 {
@@ -230,7 +230,6 @@ type RespGroupPptListItem struct {
 	ReportId      int    `description:"关联的报告ID"`
 	ReportCode    string `description:"关联的报告code"`
 	PublishTime   string `description:"发布时间"`
-	PptPage       int    `description:"ppt总页数"`
 }
 
 func (p RespGroupPptList) Len() int {

models/ppt_english/ppt_english_group_mapping.go

@@ -43,6 +43,17 @@ func GetPptMappingListByGroupId(groupId int64) (list []*PptEnglishGroupMapping,
 	return
 }
 
+// GetPptMappingListByGroupIds 根据分组ID查找
+func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptEnglishGroupMapping, err error) {
+	_, err = orm.NewOrmUsingDB("rddp").
+		QueryTable("ppt_english_group_mapping").
+		Filter("group_id__in", groupIds).
+		OrderBy("-ppt_sort", "group_ppt_id").
+		All(&list)
+
+	return
+}
+
 // GetPptMappingByPptId 查询目录下, pptId对应的目录映射关系
 func GetPptMappingByPptId(pptId int64) (item *PptEnglishGroupMapping, err error) {
 	o := orm.NewOrmUsingDB("rddp")
@@ -59,17 +70,6 @@ func GetPptMappingListByGroupIdDesc(groupId int64) (list []*PptEnglishGroupMappi
 	return
 }
 
-// GetPptMappingListByGroupIds 根据分组ID查找
-func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptEnglishGroupMapping, err error) {
-	_, err = orm.NewOrmUsingDB("rddp").
-		QueryTable("ppt_english_group_mapping").
-		Filter("group_id__in", groupIds).
-		OrderBy("-ppt_sort", "group_ppt_id").
-		All(&list)
-
-	return
-}
-
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系
 func GetPptMappingByGroupPptId(groupPptId int64, adminId int) (item *PptEnglishGroupMapping, err error) {
 	o := orm.NewOrmUsingDB("rddp")

models/ppt_v2.go

@@ -29,7 +29,8 @@ type PptV2 struct {
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT的总页数"`
+	PptPage       int       `description:"PPT页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 type PptV2Item struct {
@@ -53,7 +54,8 @@ type PptV2Item struct {
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT的总页数"`
+	PptPage       int       `description:"PPT页数"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int) (items []*PptV2Item, err error) {
@@ -125,6 +127,7 @@ type AddPptV2Req struct {
 	Content      string `description:"ppt的json数据"`
 	GroupId      int64  `description:"目录id"`
 	CoverContent string `description:"封面图内容-JSON数据"`
+	TitleSetting string `description:"PPT标题设置"`
 }
 
 type AddPptResp struct {
@@ -207,6 +210,7 @@ type PptV2SaveLog struct {
 	AdminRealName string    `description:"系统用户名称"`
 	CreateTime    time.Time `description:"创建时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
+	TitleSetting  string    `description:"PPT标题设置"`
 }
 
 // AddPptV2SaveLog 新增PPT日志

models/ppt_v2_grant.go

@@ -1,9 +1,8 @@
 package models
 
 import (
-	"time"
-
 	"github.com/beego/beego/v2/client/orm"
+	"time"
 )
 
 // PptV2Grant Ppt授权表
@@ -99,7 +98,6 @@ type PptV2InfoGrantItem struct {
 	ReportCode    string    `description:"关联的报告code"`
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
-	PptPage       int       `description:"ppt正文总页数"`
 
 	//GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
 	//PptId        int64     `description:"ppt ID"`

models/ppt_v2_group.go

@@ -1,9 +1,8 @@
 package models
 
 import (
-	"time"
-
 	"github.com/beego/beego/v2/client/orm"
+	"time"
 )
 
 type PptV2Group struct {
@@ -212,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 {
@@ -230,7 +230,6 @@ type RespGroupPptListItem struct {
 	ReportId      int    `description:"关联的报告ID"`
 	ReportCode    string `description:"关联的报告code"`
 	PublishTime   string `description:"发布时间"`
-	PptPage       int    `description:"PPT总页数"`
 }
 
 func (p RespGroupPptList) Len() int {

models/ppt_v2_group_mapping.go

@@ -38,7 +38,7 @@ func GetPptMappingCountByGroupId(groupId int64) (total int64, err error) {
 // GetPptMappingListByGroupId 查询目录下，ppt列表
 func GetPptMappingListByGroupId(groupId int64) (list []*PptV2GroupMapping, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_v2_group_mapping where group_id=? order by ppt_sort desc, group_ppt_id desc `
+	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_v2_group_mapping where group_id=? order by ppt_sort asc, group_ppt_id asc `
 	_, err = o.Raw(sql, groupId).QueryRows(&list)
 	return
 }
@@ -48,7 +48,7 @@ func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptV2GroupMapping, e
 	_, err = orm.NewOrmUsingDB("rddp").
 		QueryTable("ppt_v2_group_mapping").
 		Filter("group_id__in", groupIds).
-		OrderBy("-ppt_sort", "-group_ppt_id").
+		OrderBy("-ppt_sort", "group_ppt_id").
 		All(&list)
 
 	return

services/data/cross_variety/chart.go

@@ -349,8 +349,8 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 						}
 					}
 				}
-				// N=1时说明计算无效
-				if bigN == 1 {
+				// N<=1时说明计算无效
+				if bigN <= 1 {
 					continue
 				}
 				numerator := decimal.NewFromInt(int64(tinyN - 1))

services/data/future_good/chart_info.go

@@ -376,27 +376,13 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 // BarChartData 获取数据
 func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMappingList []*future_good2.FutureGoodEdbInfo, edbDataListMap map[int][]*data_manage.EdbDataList, barChartInfoDateList []data_manage.BarChartInfoDateReq, regionType, latestDate string) (edbIdList []int, yDataList []data_manage.YData, err error) {
 	// 指标数据数组（10086:{"2022-12-02":100.01,"2022-12-01":102.3}）
-	// 现货指标数据map
-	baseEdbDataMap := make(map[string]float64)
+	edbDataMap := make(map[int]map[string]float64)
 	for edbInfoId, edbDataList := range edbDataListMap {
-		if edbInfoId == edbInfoMapping.EdbInfoId {
-			for _, edbData := range edbDataList {
-				baseEdbDataMap[edbData.DataTime] = edbData.Value
-			}
-		}
-	}
-
-	// 期货指标数据map
-	futureGoodEdbDataMap := make(map[int]map[string]float64)
-	for edbInfoId, edbDataList := range edbDataListMap {
-		if edbInfoId == edbInfoMapping.EdbInfoId {
-			continue
-		}
 		edbDateData := make(map[string]float64)
 		for _, edbData := range edbDataList {
 			edbDateData[edbData.DataTime] = edbData.Value
 		}
-		futureGoodEdbDataMap[edbInfoId] = edbDateData
+		edbDataMap[edbInfoId] = edbDateData
 	}
 
 	// edbIdList 指标展示顺序；x轴的指标顺序
@@ -443,7 +429,7 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 		xEdbInfoIdList := make([]int, 0)    // 当前数据的指标id列表
 
 		// 现货指标
-		realDateTime, findDataValue, isFind, tmpErr := GetNeedDateData(findDateTime, edbDataListMap[edbInfoMapping.EdbInfoId], baseEdbDataMap, futureGoodEdbDataMap)
+		realDateTime, findDataValue, isFind, tmpErr := GetNeedDateData(findDateTime, edbDataListMap[edbInfoMapping.EdbInfoId], edbDataMap[edbInfoMapping.EdbInfoId])
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -456,13 +442,8 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 			noDataIdList = append(noDataIdList, edbInfoMapping.EdbInfoId)
 			noDataIdMap[edbInfoMapping.EdbInfoId] = edbInfoMapping.EdbInfoId
 		}
-		//currMonth := findDateTime.Month() // 当前月份
-		//currYear := findDateTime.Year()   // 当前年份
-
-		// 用实际日期的月份作为基准，往前推12个月（2024-5-13 16:26:43修改）
-		currMonth := realDateTime.Month() // 当前月份
-		currYear := realDateTime.Year()   // 当前年份
-
+		currMonth := findDateTime.Month() // 当前月份
+		currYear := findDateTime.Year()   // 当前年份
 		xEdbInfoIdList = append(xEdbInfoIdList, edbInfoMapping.EdbInfoId)
 		mList := make([]int, 0) // 间隔月份
 		indexList := make([]int, 0)
@@ -501,7 +482,7 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 			//}
 			//tmpRealDateTime := findDateTime	// 按照配置找到的日期
 			tmpRealDateTime := realDateTime // 实际现货的日期
-			tmpFindDataValue, tmpIsFind := futureGoodEdbDataMap[futureGoodMapping.FutureGoodEdbInfoId][tmpRealDateTime.Format(utils.FormatDate)]
+			tmpFindDataValue, tmpIsFind := edbDataMap[futureGoodMapping.FutureGoodEdbInfoId][tmpRealDateTime.Format(utils.FormatDate)]
 			yDataMap[futureGoodMapping.FutureGoodEdbInfoId] = tmpFindDataValue
 
 			findDataList = append(findDataList, tmpFindDataValue)
@@ -879,7 +860,7 @@ func getFutureGoodEdbInfoList(latestDateTime time.Time, tmpFutureGoodEdbInfoList
 }
 
 // GetNeedDateData 获取合约内需要的日期数据
-func GetNeedDateData(needDateTime time.Time, dataList []*data_manage.EdbDataList, edbDataMap map[string]float64, allEdbDataMap map[int]map[string]float64) (findDateTime time.Time, findDataValue float64, isFind bool, err error) {
+func GetNeedDateData(needDateTime time.Time, dataList []*data_manage.EdbDataList, edbDataMap map[string]float64) (findDateTime time.Time, findDataValue float64, isFind bool, err error) {
 	//dataList := edbDataListMap[edbInfoId] //指标的所有数据值
 	if len(dataList) <= 0 {
 		// 没有数据的指标id
@@ -892,43 +873,18 @@ func GetNeedDateData(needDateTime time.Time, dataList []*data_manage.EdbDataList
 		return
 	}
 
-	// 该日期存在数据的期货指标的最小数量，目前是现货和期货各1个，总共2个
-	maxCount := 1
-
 	for tmpDateTime := needDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime = tmpDateTime.AddDate(0, 0, -1) {
 		tmpDate := tmpDateTime.Format(utils.FormatDate)
-		tmpValue, ok := edbDataMap[tmpDate]
-		if !ok {
-			continue
-		}
-
-		// 该日期存在数据的指标数量
-		count := 0
-
-		for _, currEdbDataMap := range allEdbDataMap {
-			_, tmpIsFind := currEdbDataMap[tmpDate]
-			if tmpIsFind {
-				count++
-				if count >= maxCount {
-					continue
-				}
+		if tmpValue, ok := edbDataMap[tmpDate]; ok { //如果能找到数据，那么就返回
+			// 数据为0,也直接返回,做无值处理
+			if tmpValue == 0 {
+				return
 			}
-		}
-
-		// 该日期存在数据的期货指标数量小于2个，那么要继续往前找
-		if count < maxCount {
-			continue
-		}
-
-		//如果能找到数据，那么就返回
-		// 数据为0,也直接返回,做无值处理
-		if tmpValue == 0 {
+			findDateTime, _ = time.ParseInLocation(utils.FormatDate, tmpDate, time.Local)
+			findDataValue = tmpValue
+			isFind = true
 			return
 		}
-		findDateTime, _ = time.ParseInLocation(utils.FormatDate, tmpDate, time.Local)
-		findDataValue = tmpValue
-		isFind = true
-		return
 	}
 
 	return

services/data/future_good/profit_chart_info.go

@@ -248,7 +248,7 @@ func ProfitChartChartData(baseDataList []*data_manage.EdbDataList, futureGoodEdb
 		xEdbInfoIdList := make([]int, 0)   // 当前数据的指标id列表
 
 		// 现货指标
-		realDateTime, findDataValue, isFind, tmpErr := GetNeedDateData(findDateTime, baseDataList, baseEdbDateData, edbDataMap)
+		realDateTime, findDataValue, isFind, tmpErr := GetNeedDateData(findDateTime, baseDataList, baseEdbDateData)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -274,9 +274,7 @@ func ProfitChartChartData(baseDataList []*data_manage.EdbDataList, futureGoodEdb
 			//findDateTime
 
 			// 获取当前日期相对开始日期的期数
-			//tmpN := (currDate.Year()-findDateTime.Year())*12 + int(currDate.Month()-findDateTime.Month())
-			// 用实际日期的月份作为基准，往前推12个月（2024-5-13 16:26:43修改）
-			tmpN := (currDate.Year()-realDateTime.Year())*12 + int(currDate.Month()-realDateTime.Month())
+			tmpN := (currDate.Year()-findDateTime.Year())*12 + int(currDate.Month()-findDateTime.Month())
 			if tmpN <= 0 {
 				continue
 			}

services/data/line_feature/chart_info.go

@@ -158,6 +158,7 @@ func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *
 	// 百分位数据个数算法
 	// 数据区间第一个和最后一个数据点的时间和数据分别为(T1,S1)(T2,S2); N=T1到T2指标数据个数, n=小于等于S2的数据个数
 	// 个数百分位=(n-1)/(N-1)
+	maxDay := len(dataList) // 往前找数据的边界
 	if percentType == utils.PercentCalculateTypeNum {
 		for i, d := range dataList {
 			// T2为当前日期
@@ -166,7 +167,11 @@ func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *
 
 			// 计算N和n
 			var bigN, tinyN int
-			for k := 0; k < calculateDay; k++ {
+			for k := 0; k < maxDay; k++ {
+				// 往前找(时间长度)个有数据的, N理论上只有最前面几个日期<calculateDay, 后面的N=calculateDay
+				if bigN >= calculateDay {
+					break
+				}
 				preVal, preOk := dataMap[t2.AddDate(0, 0, -k)]
 				if !preOk {
 					continue
@@ -177,8 +182,8 @@ func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *
 				}
 			}
 
-			// N=1时说明计算无效
-			if bigN == 1 {
+			// N<=1时说明计算无效
+			if bigN <= 1 {
 				continue
 			}
 			numerator := decimal.NewFromInt(int64(tinyN - 1))

services/ppt/ppt_english_group.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"eta/eta_api/models/ppt_english"
 	"eta/eta_api/models/system"
-	"eta/eta_api/services"
 	"eta/eta_api/utils"
 	"fmt"
 	"sort"
@@ -215,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)
 	}
@@ -372,7 +372,7 @@ func GetGroupPptEnglishList(groupId int64, adminId int) (ret ppt_english.RespGro
 			return
 		}
 		groups = append(groups, groupInfo)
-		groupPptList, tErr = ppt_english.GetPptMappingListByGroupIdDesc(groupId)
+		groupPptList, tErr = ppt_english.GetPptMappingListByGroupId(groupId)
 		if tErr != nil {
 			err = errors.New("目录里的ppt查询出错:" + tErr.Error())
 			return
@@ -404,16 +404,6 @@ func GetGroupPptEnglishList(groupId int64, adminId int) (ret ppt_english.RespGro
 	}
 
 	for _, v := range pptList {
-		// 解决部分历史ppt数据不存在TotalPages的情况
-		if v.PptPage == 0 {
-			var pptContent []services.PPTContent
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				err = errors.New("解析ppt内容出错" + err.Error())
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		pptMap[v.PptId] = v
 	}
 
@@ -441,7 +431,6 @@ func GetGroupPptEnglishList(groupId int64, adminId int) (ret ppt_english.RespGro
 							ReportId:      pptInfo.ReportId,
 							ReportCode:    pptInfo.ReportCode,
 							PublishTime:   utils.DealDateTimeZero(pptInfo.PublishTime, utils.FormatDateTime),
-							PptPage:       pptInfo.PptPage,
 						}
 						if pptV.ChildGroupPptId > 0 {
 							tmp.IsSingleShare = 1
@@ -752,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)
 
@@ -799,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
 }
@@ -1225,15 +1216,7 @@ func GetMyPptEnglishList(adminId int, keyword string) (ret ppt_english.RespGroup
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &ppt_english.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1249,7 +1232,6 @@ func GetMyPptEnglishList(adminId int, keyword string) (ret ppt_english.RespGroup
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1291,15 +1273,7 @@ func GetSharePptEnglishList(adminId int, keyword string, isPrivate bool) (ret pp
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &ppt_english.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1315,7 +1289,6 @@ func GetSharePptEnglishList(adminId int, keyword string, isPrivate bool) (ret pp
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1360,15 +1333,7 @@ func GetGrantPptEnglishList(adminId int, keyword, sourceType string) (ret ppt_en
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &ppt_english.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1385,7 +1350,6 @@ func GetGrantPptEnglishList(adminId int, keyword, sourceType string) (ret ppt_en
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1444,15 +1408,7 @@ func SearchEnglishPptList(adminId int, keyword string) (ret ppt_english.RespGrou
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &ppt_english.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1466,7 +1422,6 @@ func SearchEnglishPptList(adminId int, keyword string) (ret ppt_english.RespGrou
 			PptxUrl:       v.PptxUrl,
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}

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)
 	}
@@ -629,7 +630,6 @@ func GetGroupPptList(groupId int64, adminId int) (ret models.RespGroupPptList, e
 							ReportId:      pptInfo.ReportId,
 							ReportCode:    pptInfo.ReportCode,
 							PublishTime:   utils.DealDateTimeZero(pptInfo.PublishTime, utils.FormatDateTime),
-							PptPage:       pptInfo.PptPage,
 						}
 						if pptV.ChildGroupPptId > 0 {
 							tmp.IsSingleShare = 1
@@ -946,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)
 
@@ -998,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
 }
@@ -1585,7 +1587,6 @@ func GetMyPptList(adminId int, keyword string) (ret models.RespGroupPptList, err
 	if len(pptList) <= 0 {
 		return
 	}
-
 	var pptContent []services.PPTContent
 	for _, v := range pptList {
 		if v.PptPage == 0 && v.Content != "" {
@@ -1611,7 +1612,6 @@ func GetMyPptList(adminId int, keyword string) (ret models.RespGroupPptList, err
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1653,15 +1653,7 @@ func GetSharePptList(adminId int, keyword string, isPrivate bool) (ret models.Re
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &models.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1678,7 +1670,6 @@ func GetSharePptList(adminId int, keyword string, isPrivate bool) (ret models.Re
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1723,15 +1714,7 @@ func GetGrantPptList(adminId int, keyword, sourceType string) (ret models.RespGr
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &models.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1748,7 +1731,6 @@ func GetGrantPptList(adminId int, keyword, sourceType string) (ret models.RespGr
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
 			PublishTime:   utils.DealDateTimeZero(v.PublishTime, utils.FormatDateTime),
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}
@@ -1781,15 +1763,7 @@ func SearchPptList(adminId int, keyword string) (ret models.RespGroupPptList, er
 		return
 	}
 
-	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
-			err = json.Unmarshal([]byte(v.Content), &pptContent)
-			if err != nil {
-				return
-			}
-			v.PptPage = len(pptContent)
-		}
 		tmpV := &models.RespGroupPptListItem{
 			GroupPptId:    int64(v.PptId),
 			PptId:         int64(v.PptId),
@@ -1804,7 +1778,6 @@ func SearchPptList(adminId int, keyword string) (ret models.RespGroupPptList, er
 			PptxUrl:       v.PptxUrl,
 			ReportId:      v.ReportId,
 			ReportCode:    v.ReportCode,
-			PptPage:       v.PptPage,
 		}
 		list = append(list, tmpV)
 	}