Merge branch 'bzq/ppt' of eta_server/eta_api into debug

models/ppt_english/ppt_english_grant.go

@@ -1,8 +1,9 @@
 package ppt_english
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
 )
 
 // PptEnglishGrant Ppt授权表
@@ -98,6 +99,7 @@ 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_v2_grant.go

@@ -1,8 +1,9 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
 )
 
 // PptV2Grant Ppt授权表
@@ -98,6 +99,7 @@ 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"`

services/ppt/ppt_english_group.go

@@ -1225,7 +1225,15 @@ 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),
@@ -1241,6 +1249,7 @@ 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)
 	}
@@ -1282,7 +1291,15 @@ 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),
@@ -1298,6 +1315,7 @@ 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)
 	}
@@ -1342,7 +1360,15 @@ 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),
@@ -1359,6 +1385,7 @@ 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)
 	}
@@ -1417,7 +1444,15 @@ 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),
@@ -1431,6 +1466,7 @@ 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

@@ -1586,7 +1586,15 @@ func GetMyPptList(adminId int, keyword string) (ret models.RespGroupPptList, err
 		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),
@@ -1603,6 +1611,7 @@ 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)
 	}
@@ -1644,7 +1653,15 @@ 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),
@@ -1661,6 +1678,7 @@ 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)
 	}
@@ -1705,7 +1723,15 @@ 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),
@@ -1722,6 +1748,7 @@ 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)
 	}
@@ -1754,7 +1781,15 @@ 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),
@@ -1769,6 +1804,7 @@ 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)
 	}