Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/report.go

@@ -1080,11 +1080,28 @@ func (this *ReportCommonController) CompanyList() {
 	listLogo := make([]*models.ArticleDataLogoResp, 0)
 	for i := range list {
 		v := list[i]
-		listLogo = append(listLogo, &models.ArticleDataLogoResp{
-			ArticleId:   v.ArticleId,
-			Cover:       v.Cover,
-			ComapnyList: services.HandleArticleStock(v.Stock),
-		})
+		comapnyList := services.HandleArticleStock(v.Stock)
+		if len(comapnyList) > 1 {
+			for kC, vC := range comapnyList {
+				sliceCovers := strings.Split(v.Cover, "{|}")
+				cover := v.Cover
+				if len(sliceCovers) == len(comapnyList) {
+					cover = sliceCovers[kC]
+				}
+				listLogo = append(listLogo, &models.ArticleDataLogoResp{
+					ArticleId:   v.ArticleId,
+					Cover:       cover,
+					ComapnyList: services.HandleArticleStock(vC.ComapnyName),
+				})
+			}
+		} else {
+			listLogo = append(listLogo, &models.ArticleDataLogoResp{
+				ArticleId:   v.ArticleId,
+				Cover:       v.Cover,
+				ComapnyList: services.HandleArticleStock(v.Stock),
+			})
+		}
+
 	}
 	resp := new(models.ArticleDataLogoListResp)
 	resp.List = listLogo

models/micro_roadshow.go

@@ -168,6 +168,15 @@ func GetMicroRoadshowVideoByIndustryIdCount(industryId int) (count int, err erro
 	return
 }
 
+//GetMicroRoadshowVideoByVideoIdCount  根据视频ID查询产业视频是否存在
+func GetMicroRoadshowVideoByVideoIdCount(industryId int) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(1) count
+			FROM cygx_micro_roadshow_video WHERE video_id = ? and publish_status = 1`
+	err = o.Raw(sql, industryId).QueryRow(&count)
+	return
+}
+
 // GetMicroRoadshowVideoList 获取已经发布的微路演视频
 func GetMicroRoadshowVideoList() (list []*MicroRoadshowVideo, err error) {
 	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE  publish_status = 1`

services/article.go

@@ -125,6 +125,18 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 			list[k].IsNeedJump = true
 		}
 		list[k].Source = 1
+		//添加行业默认图片
+		if v.ImgUrlPc == "" {
+			if v.ChartPermissionName == utils.YI_YAO_NAME {
+				list[k].ImgUrlPc = utils.YI_YAO_OTHER_IMG
+			} else if v.ChartPermissionName == utils.XIAO_FEI_NAME {
+				list[k].ImgUrlPc = utils.XIAO_FEI_OTHER_IMG
+			} else if v.ChartPermissionName == utils.KE_JI_NAME {
+				list[k].ImgUrlPc = utils.KE_JI_OTHER_IMG
+			} else if v.ChartPermissionName == utils.ZHI_ZAO_NAME {
+				list[k].ImgUrlPc = utils.ZHI_ZAO_OTHER_IMG
+			}
+		}
 	}
 	if len(list) == 0 {
 		list = make([]*models.ArticleListResp, 0)

services/micro_roadshow.go

@@ -107,7 +107,7 @@ func GetindustryVideo(user *models.WxUserItem, industrialManagementId int) (indu
 
 //GetindustryVideoDetailById 通过视频ID获取视频详情
 func GetindustryVideoDetailById(user *models.WxUserItem, videoId int) (industryVideo *models.MicroVideoSimpleInfo, AuthInfo *models.UserPermissionAuthInfo, err error) {
-	total, e := models.GetMicroRoadshowVideoByIndustryIdCount(videoId)
+	total, e := models.GetMicroRoadshowVideoByVideoIdCount(videoId)
 	if e != nil {
 		err = errors.New("获取产业关联的视频失败，GetMicroRoadshowVideoByIndustryIdCount " + e.Error())
 		return

utils/constants.go

@@ -65,12 +65,16 @@ const (
 	CHART_PERMISSION_NAME_MF_YANXUAN string = "买方研选"
 	CHART_PERMISSION_ID_YANXUAN      int    = 31
 	YI_YAO_NAME                      string = "医药"
+	YI_YAO_OTHER_IMG                 string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/qzPm61bVf40Je7c5iL1s4CbrDcpv.png" //医药其它图片
 	YI_YAO_ID                        int    = 22
 	XIAO_FEI_NAME                    string = "消费"
+	XIAO_FEI_OTHER_IMG               string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/BxOfzECjhqjipJCWwAa9Ep99OTMA.png" //消费其它图片
 	XIAO_FEI_ID                      int    = 21
 	KE_JI_NAME                       string = "科技"
+	KE_JI_OTHER_IMG                  string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/vr7eTXIrl6YjJ80DDTVbdnFRQ9mJ.png" //科技其它图片
 	KE_JI_ID                         int    = 20
 	ZHI_ZAO_NAME                     string = "智造"
+	ZHI_ZAO_OTHER_IMG                string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/SSaQcWzMk5slN3FkCwZifK3qcAWd.png" //智造其它图片
 	ZHI_ZAO_ID                       int    = 19
 	SummaryArticleId                 int    = 1000000
 	StrategyPlatform                 string = "https://vmp.hzinsights.com/v2/articles/"