Merge branch 'clpt_v2.2' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

# Conflicts:
#	services/report.go

controllers/report.go

@@ -271,163 +271,6 @@ func (this *MobileReportController) IndustryList() {
 			list[k].IsHot = true
 		}
 	}
-
-	//mapUPdateTime := make(map[int]string)
-	//mapHistroyArticleId := make(map[int]int)
-	//articleIdArr := make([]int, 0)
-	////获取这些产业下最新更新的文章
-	//listUpdateTime, err := models.GetNewArticleDetailByIndustrialIds(industrialIdArr)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取信息失败"
-	//	br.ErrMsg = "获取信息失败 GetNewArticleDetailByIndustrialIds ,Err:" + err.Error()
-	//	return
-	//}
-	//for _, v := range listUpdateTime {
-	//	mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
-	//	articleIdArr = append(articleIdArr, v.ArticleId)
-	//}
-	//if uid > 0 {
-	//	listArticleHistory, err := models.GetUserToArticleHistory(uid, industrialIdArr)
-	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取信息失败 GetUserToArticleHistory ,Err:" + err.Error()
-	//		return
-	//	}
-	//	for _, v := range listArticleHistory {
-	//		mapHistroyArticleId[v.ArticleId] = v.ArticleId
-	//	}
-	//}
-	//nowTime := time.Now().Local()
-	//threeMonBefore := nowTime.AddDate(0, -3, 0)
-	//for k, v := range list {
-	//	list[k].UpdateTime = utils.TimeRemoveHms(mapUPdateTime[v.IndustrialManagementId])
-	//	if uid > 0 {
-	//		//如果文章没有阅读，而且，文章的发布时间晚于项目的上线时间，而且文章的发布时间晚于用户的注册时间，就进行标红处理
-	//		if mapHistroyArticleId[v.ArticleId] == 0 && user.CreatedTime.Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
-	//			list[k].IsRed = true
-	//		}
-	//	} else {
-	//		if utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
-	//			list[k].IsRed = true
-	//		}
-	//		list[k].IsFollow = false
-	//	}
-	//	// 关联报告发布时间均在3个月内则标记New
-	//	if v.MinReportTime != "" {
-	//		t, e := time.Parse(utils.FormatDateTime, v.MinReportTime)
-	//		if e != nil {
-	//			br.Msg = "获取信息失败"
-	//			br.ErrMsg = "报告最早发布时间有误, Err: " + e.Error()
-	//			return
-	//		}
-	//		if t.After(threeMonBefore) {
-	//			list[k].IsNew = true
-	//		}
-	//	}
-	//	//标的列表
-	//	industrialSubjectList, err := models.GetIndustrialSubjectAll(v.IndustrialManagementId)
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	list[k].IndustrialSubjectList = industrialSubjectList
-	//}
-	//
-	////查询产业视频
-	//industrialVideoMap := make(map[int]*models.MicroVideoSimpleInfo)
-	//var industrialManagementIds []int
-	//for _, v := range list {
-	//	if v.IndustrialManagementId > 0 {
-	//		industrialManagementIds = append(industrialManagementIds, v.IndustrialManagementId)
-	//	}
-	//}
-	//
-	//// 用户权限
-	//authInfo, permissionArr, e := services.GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
-	//if e != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取用户权限失败, Err: " + e.Error()
-	//	return
-	//}
-	//
-	//if len(industrialManagementIds) > 0 {
-	//	// 获取默认图配置
-	//	_, videoMap, _, _, e := services.GetMicroRoadShowDefaultImgConfig()
-	//	if e != nil {
-	//		br.Msg = "获取视频默认配置图失败"
-	//		br.ErrMsg = "获取视频默认配置图失败, Err: " + e.Error()
-	//		return
-	//	}
-	//	videoList, err := models.GetMicroRoadshowVideoByIndustryIds(industrialManagementIds)
-	//	if err != nil {
-	//		br.Msg = "产业视频列表失败"
-	//		br.ErrMsg = "产业视频列表失败, Err: " + err.Error()
-	//		return
-	//	}
-	//	for _, v := range videoList {
-	//		tmp := &models.MicroVideoSimpleInfo{
-	//			Id:                  v.VideoId,
-	//			Title:               "5min【" + v.IndustryName + "】逻辑解析",
-	//			ResourceUrl:         v.VideoUrl,
-	//			BackgroundImg:       v.ImgUrl,
-	//			PlaySeconds:         v.VideoDuration,
-	//			DetailImgUrl:        v.DetailImgUrl,
-	//			ChartPermissionId:   v.ChartPermissionId,
-	//			ChartPermissionName: v.ChartPermissionName,
-	//		}
-	//		if tmp.BackgroundImg == "" {
-	//			tmp.BackgroundImg = videoMap[v.ChartPermissionId]
-	//		}
-	//		industrialVideoMap[v.IndustryId] = tmp
-	//	}
-	//}
-	//
-	////nowTime := time.Now().Local()
-	////threeMonBefore := nowTime.AddDate(0, -3, 0)
-	//for k, v := range list {
-	//	list[k].LayoutTime = utils.TimeRemoveHms(v.LayoutTime)
-	//	// 关联报告发布时间均在3个月内则标记New
-	//	if v.MinReportTime != "" {
-	//		t, e := time.Parse(utils.FormatDateTime, v.MinReportTime)
-	//		if e != nil {
-	//			br.Msg = "获取信息失败"
-	//			br.ErrMsg = "报告最早发布时间有误, Err: " + e.Error()
-	//			return
-	//		}
-	//		if t.After(threeMonBefore) {
-	//			list[k].IsNew = true
-	//		}
-	//	}
-	//	//展示产业视频
-	//	if video, ok := industrialVideoMap[v.IndustrialManagementId]; ok {
-	//		//控制用户权限
-	//		// 权限
-	//		au := new(models.UserPermissionAuthInfo)
-	//		au.SellerName = authInfo.SellerName
-	//		au.SellerMobile = authInfo.SellerMobile
-	//		au.HasPermission = authInfo.HasPermission
-	//		au.OperationMode = authInfo.OperationMode
-	//		if au.HasPermission == 1 {
-	//			// 非宏观权限进一步判断是否有权限
-	//			if video.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, video.ChartPermissionName) {
-	//				au.HasPermission = 2
-	//			}
-	//		}
-	//		// 无权限的弹框提示
-	//		if au.HasPermission != 1 {
-	//			if au.OperationMode == services.UserPermissionOperationModeCall {
-	//				au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
-	//			} else {
-	//				au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
-	//			}
-	//			video.ResourceUrl = ""
-	//		}
-	//		list[k].AuthInfo = au
-	//		list[k].IndustryVideo = video
-	//	}
-	//}
-
 	if orderColumnNew != "" {
 		item := new(models.CygxReportIndustrialSeaarchHistory)
 		item.UserId = user.UserId

models/report.go

@@ -131,6 +131,7 @@ func GetSearchResourceList(condition string) (items []*IndustrialManagement, err
 			m.chart_permission_id,
 			m.industrial_management_id,
  			MAX( a.publish_date ) as publish_date_order,
+			MIN( a.publish_date ) AS min_report_time,
 			date_format( MAX( a.publish_date ), '%Y-%m-%d' ) AS publish_date 
 		FROM
 			cygx_industrial_management AS m

services/report.go

@@ -97,64 +97,7 @@ func GetSearchResourceListHz(condition string, user *models.WxUserItem) (items [
 	if err != nil {
 		return
 	}
-
 	listHz, err = HandleIndustryList(listHz, user)
-	//合并产业关联的标的
-	//listSubjcet, err := models.GetThemeHeatSubjectList("")
-	//if err != nil {
-	//	return
-	//}
-	//industrialIdArr := make([]int, 0)
-	//for k, v := range listHz {
-	//	listHz[k].Source = 1
-	//	if fllowMap[v.IndustrialManagementId] > 0 {
-	//		listHz[k].IsFollow = true
-	//	}
-	//	industrialIdArr = append(industrialIdArr, v.IndustrialManagementId)
-	//	videoSimple, au, e := GetindustryVideo(user, v.IndustrialManagementId)
-	//	if e != nil {
-	//		err = errors.New("获取产业关联的视频失败，GetindustryVideo " + e.Error())
-	//		return
-	//	}
-	//	if videoSimple != nil && videoSimple.Id > 0 {
-	//		v.IndustryVideo = videoSimple
-	//	}
-	//	v.AuthInfo = au
-	//}
-	//
-	//if len(industrialIdArr) > 0 {
-	//	//合并产业关联的标的
-	//	listSubjcet, err = models.GetIndustrialSubjectAllByIndustrialId(industrialIdArr)
-	//	if err != nil {
-	//		return
-	//	}
-	//	mapIndustrial := make(map[string]int)
-	//	for _, v := range listSubjcet {
-	//		for k2, v2 := range listHz {
-	//			if v2.IndustrialManagementId == v.IndustrialManagementId && mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Hz", v.SubjectName)] == 0 {
-	//				listHz[k2].IndustrialSubjectList = append(listHz[k2].IndustrialSubjectList, v)
-	//				mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Hz", v.SubjectName)] = v2.IndustrialManagementId
-	//			}
-	//		}
-	//	}
-	//}
-	//
-	//mapUPdateTime := make(map[int]string)
-	//articleIdArr := make([]int, 0)
-	////获取这些产业下最新更新的文章
-	//
-	//fmt.Println(industrialIdArr)
-	//listUpdateTime, err := models.GetNewArticleDetailByIndustrialIds(industrialIdArr)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	return
-	//}
-	//for _, v := range listUpdateTime {
-	//	mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
-	//	articleIdArr = append(articleIdArr, v.ArticleId)
-	//}
-	//for k, v := range listHz {
-	//	listHz[k].UpdateTime = utils.TimeRemoveHms(mapUPdateTime[v.IndustrialManagementId])
-	//}
 	items = listHz
 	return
 }