|
@@ -516,80 +516,10 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
return
|
|
|
}
|
|
|
for _, v := range listArticle {
|
|
|
- fmt.Println(v.Title)
|
|
|
mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //处理晨会精华
|
|
|
- if len(meetingreviewchaptIds) > 0 {
|
|
|
- //pars = make([]interface{}, 0)
|
|
|
- //condition = ` AND c.id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
|
|
|
- //pars = append(pars, meetingreviewchaptIds)
|
|
|
-
|
|
|
- listrMeet, e := GetCygxMorningMeetingReviewChapterListByIds(meetingreviewchaptIds)
|
|
|
- if e != nil {
|
|
|
- err = errors.New("GetResourceDataList, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- for _, v := range listrMeet {
|
|
|
- v.Content = AnnotationHtml(v.Content)
|
|
|
- v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
|
|
|
- mapItems[fmt.Sprint("meetingreviewchapt", v.Id)].Meetingreviewchapt = v
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //处理上周纪要汇总
|
|
|
- if len(minutessummaryIds) > 0 {
|
|
|
- pars = make([]interface{}, 0)
|
|
|
- condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(minutessummaryIds)) + `)`
|
|
|
- pars = append(pars, minutessummaryIds)
|
|
|
-
|
|
|
- listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, len(minutessummaryIds))
|
|
|
- if e != nil {
|
|
|
- err = errors.New("GetResourceDataList, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- for _, v := range listresearchsummary {
|
|
|
- v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
|
|
|
- mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //处理本周纪要汇总
|
|
|
- if len(researchsummaryIds) > 0 {
|
|
|
- pars = make([]interface{}, 0)
|
|
|
- condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
|
|
|
- pars = append(pars, researchsummaryIds)
|
|
|
-
|
|
|
- listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
|
|
|
- if e != nil {
|
|
|
- err = errors.New("GetReportSelectionListHome, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- for _, v := range listresearchsummary {
|
|
|
- v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
|
|
|
- mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //处理产品内测
|
|
|
- if len(productinteriorIds) > 0 {
|
|
|
- pars = make([]interface{}, 0)
|
|
|
- condition = ` AND art.status = 1 AND art.product_interior_id IN (` + utils.GetOrmInReplace(len(productinteriorIds)) + `)`
|
|
|
- pars = append(pars, productinteriorIds)
|
|
|
- listProductInterior, e := models.GetCygxProductInteriorList(condition, pars, 0, len(productinteriorIds))
|
|
|
- if e != nil {
|
|
|
- err = errors.New("GetCygxProductInteriorList, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- for _, v := range listProductInterior {
|
|
|
- v.Body = ProductInteriorHtml(v.Body)
|
|
|
- v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
|
|
|
- mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].ProductInterior = v
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
detail, e := models.GetConfigByCode("city_img_url")
|
|
|
if e != nil {
|
|
|
err = errors.New("GetResourceDataList, Err: " + e.Error())
|