|
|
@@ -431,6 +431,10 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
|
|
|
reportItem.ContentSub = html.UnescapeString(reportInfo.ContentSub)
|
|
|
reportItem.Frequency = reportInfo.Frequency
|
|
|
reportItem.VideoName = reportInfo.VideoName
|
|
|
+ reportItem.ReportLayout = reportInfo.ReportLayout
|
|
|
+ reportItem.HeadImg = reportInfo.HeadImg
|
|
|
+ reportItem.EndImg = reportInfo.EndImg
|
|
|
+ reportItem.CanvasColor = reportInfo.CanvasColor
|
|
|
if reportInfo.VideoName == "" && reportInfo.VideoUrl != "" {
|
|
|
reportItem.VideoName = reportInfo.Title
|
|
|
}
|
|
|
@@ -920,6 +924,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
|
|
|
for _, reportInfo := range list {
|
|
|
reportItem := new(response.ReportListItem)
|
|
|
reportItem.ReportId = reportInfo.Id
|
|
|
+ reportItem.HasChapter = reportInfo.HasChapter
|
|
|
// 样式限制行数
|
|
|
reportItem.Title = "<div style=\"-webkit-line-clamp: 2;-webkit-box-orient: vertical;display: -webkit-box;overflow: hidden;text-overflow: ellipsis;\">" + reportInfo.Title + "</div>"
|
|
|
reportItem.PublishTime = reportInfo.PublishTime
|
|
|
@@ -1034,6 +1039,76 @@ func GetCollectReportList(user user.UserInfo, chartPermissionId, pageIndex, page
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ var reportList []*response.ReportCollectListItem
|
|
|
+ list := response.ReportCollectListResp{}
|
|
|
+ var total int64
|
|
|
+
|
|
|
+ {
|
|
|
+ offset := (pageIndex - 1) * pageSize
|
|
|
+ reportList, err = report.GetReportCollectListByPermissionV1(chartPermissionId, classifySecondIds, offset, pageSize)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = err.Error()
|
|
|
+ err = errors.New("查询报告信息出错")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ listMap := make(map[string]*response.ReportCollectList)
|
|
|
+ for _, v := range reportList {
|
|
|
+ v.ContentSub = GetReportContentSub(v.ContentSub, true)
|
|
|
+ if _, ok := listMap[v.PublishTime.Format("2006-01-02")]; !ok {
|
|
|
+ temp := new(response.ReportCollectList)
|
|
|
+ temp.Date = v.PublishTime.Format("2006-01-02")
|
|
|
+ listMap[v.PublishTime.Format("2006-01-02")] = temp
|
|
|
+ }
|
|
|
+ listMap[v.PublishTime.Format("2006-01-02")].SubList = append(listMap[v.PublishTime.Format("2006-01-02")].SubList, v)
|
|
|
+ }
|
|
|
+ for _, v := range listMap {
|
|
|
+ list = append(list, v)
|
|
|
+ }
|
|
|
+ total, err = report.GetReportCollectCountByPermissionV1(chartPermissionId, classifySecondIds)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = err.Error()
|
|
|
+ err = errors.New("查询报告总数出错")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if len(list) > 0 {
|
|
|
+ sort.Sort(list)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = new(response.ReportCollectResp)
|
|
|
+ ret.List = list
|
|
|
+ ret.Paging = response.GetPaging(pageIndex, pageSize, int(total))
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
+func GetCollectReportListBak(user user.UserInfo, chartPermissionId, pageIndex, pageSize int) (ret *response.ReportCollectResp, err error) {
|
|
|
+ var errMsg string
|
|
|
+ defer func() {
|
|
|
+ if err != nil {
|
|
|
+ global.LOG.Critical(fmt.Sprintf("GetCollectReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
|
|
|
+ }
|
|
|
+ }()
|
|
|
+
|
|
|
+ // 查询权限的基本信息
|
|
|
+ permissionInfo, err := chart_permission.GetByChartPermissionId(chartPermissionId)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = err.Error()
|
|
|
+ err = errors.New("查询权限出错")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if permissionInfo.ChartPermissionID == 0 {
|
|
|
+ err = errors.New("权限不存在")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ // 除了晨报和周报以外的其他报告
|
|
|
+ classifySecondIds, err := chart_permission_search_key_word_mapping.GetClassifyIdsByChartPermissionId(chartPermissionId, "rddp")
|
|
|
+ if err != nil {
|
|
|
+ errMsg = err.Error()
|
|
|
+ err = errors.New("查询权限对应的分类出错")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
//var classifySecondIds []int
|
|
|
//if len(classifyNames) > 0 {
|
|
|
// classifySecondIds, err = classify.GetSecondIdsByClassifyNames(classifyNames)
|
|
|
@@ -1107,6 +1182,7 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
|
|
|
err = errors.New("分类查询出错")
|
|
|
return
|
|
|
}
|
|
|
+ classifyIdList := make([]int, 0)
|
|
|
var classifyIdFirsts []int
|
|
|
classifyIdSeconds := []int{0}
|
|
|
for _, v := range classifys {
|
|
|
@@ -1115,9 +1191,10 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
|
|
|
} else {
|
|
|
classifyIdSeconds = append(classifyIdSeconds, v.Id)
|
|
|
}
|
|
|
+ classifyIdList = append(classifyIdList, v.Id)
|
|
|
}
|
|
|
keyWord = addAliasToKeyword(keyWord)
|
|
|
- searchResp, total, err := elasticService.SearchReport(keyWord, classifyIdFirsts, classifyIdSeconds, pageIndex, pageSize)
|
|
|
+ searchResp, total, err := elasticService.SearchReport(keyWord, classifyIdList, pageIndex, pageSize)
|
|
|
if err != nil {
|
|
|
errMsg = err.Error()
|
|
|
err = errors.New("查询失败")
|
|
|
@@ -1146,6 +1223,8 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
|
|
|
temp.ClassifyNameFirst = reportItem.ClassifyNameFirst
|
|
|
temp.ClassifyIdSecond = reportItem.ClassifyIdSecond
|
|
|
temp.ClassifyNameSecond = reportItem.ClassifyNameSecond
|
|
|
+ temp.ClassifyId = reportItem.ClassifyId
|
|
|
+ temp.ClassifyName = reportItem.ClassifyName
|
|
|
temp.Title = reportItem.Title
|
|
|
temp.ContentSub = reportItem.BodyContent
|
|
|
temp.PublishTime, err = time.ParseInLocation(utils.FormatDateTime, reportItem.PublishTime, time.Local)
|
