|
@@ -630,6 +630,7 @@ 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
|
|
@@ -1612,6 +1613,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)
|
|
|
}
|
|
@@ -1653,7 +1655,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),
|
|
@@ -1670,6 +1680,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)
|
|
|
}
|
|
@@ -1714,7 +1725,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),
|
|
@@ -1731,6 +1750,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)
|
|
|
}
|
|
@@ -1763,7 +1783,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),
|
|
@@ -1778,6 +1806,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)
|
|
|
}
|