细分产业默认更新时间排序，将跟踪点评的发布时间，和专项产业调研的发布时间也纳入更新时间

models/industrial_management.go

@@ -126,7 +126,7 @@ func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize,
 	sql := `SELECT
 			man.*,
 			re.chart_permission_name,
-            MAX( art.publish_date ) AS update_time ,
+			man.new_art_publish_date  AS update_time ,
 			MIN(art.publish_date) AS min_report_time,` + conditionBillboard + `
 		    (SELECT COUNT( 1 )  FROM cygx_industry_fllow AS f WHERE f.user_id = ` + strconv.Itoa(uid) + ` AND f.industrial_management_id = man.industrial_management_id AND f.type = 1) AS is_follow
 			FROM
@@ -186,14 +186,13 @@ func GetNewArticleDetailByIndustrialIds(industrialIdArr []int) (items []*Industr
 			cygx_industrial_article_group_management AS mg
 			INNER JOIN cygx_article AS a ON mg.article_id = a.article_id 
 		WHERE
-			1 = 1 
-			AND a.article_id < ?
+			1 = 1
 			AND a.is_report = 1
 			AND a.is_class = 1
 			AND mg.industrial_management_id IN(` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   
 		GROUP BY
 			mg.industrial_management_id `
-	_, err = o.Raw(sql, utils.SummaryArticleId, industrialIdArr).QueryRows(&items)
+	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
 	return
 }
 

models/search_key_word_log.go

@@ -6,16 +6,17 @@ import (
 )
 
 type CygxSearchKeyWordLog struct {
-	Id          int       `orm:"column(id);" description:"id"`
-	KeyWord     string    `description:"搜索关键词"`
-	UserId      int       `description:"用户ID"`
-	CreateTime  time.Time `description:"搜索时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	Source      int       `description:"来源；1:纪要、2：图表、3：纪要/图表、4：产业资源包、5：报告、6：活动"`
+	Id               int       `orm:"column(id);" description:"id"`
+	KeyWord          string    `description:"搜索关键词"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"搜索时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	Source           int       `description:"来源；1:纪要、2：图表、3：纪要/图表、4：产业资源包、5：报告、6：活动"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 //新增搜索

services/industrial_management.go

@@ -119,7 +119,8 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		}
 		v.AuthInfo = au
 	}
-
+	mapUPdateTime := make(map[int]string)
+	mapHistroyArticleId := make(map[int]int)
 	if len(industrialIdArr) > 0 {
 		//合并产业关联的标的
 		listSubjcet, err = models.GetIndustrialSubjectAllByIndustrialId(industrialIdArr)
@@ -135,44 +136,44 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 				}
 			}
 		}
-	}
-	mapUPdateTime := make(map[int]string)
-	articleIdArr := make([]int, 0)
-	//获取这些产业下最新更新的文章
 
-	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)
-	}
-
-	//时间线的更新时间
-	//	maptimelineUPdateTime := make(map[int]string)
-	listtimelinePublishdate, err := models.GetTimeLineReportIndustrialPublishdateList(industrialIdArr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return
-	}
-	for _, v := range listtimelinePublishdate {
-		if mapUPdateTime[v.IndustrialManagementId] != "" {
-			if utils.StrTimeToTime(v.PublishDate).After(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
+		articleIdArr := make([]int, 0)
+		//获取这些产业下最新更新的文章
+		if len(industrialIdArr) > 0 {
+			listUpdateTime, e := models.GetNewArticleDetailByIndustrialIds(industrialIdArr)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = e
+				return
+			}
+			for _, v := range listUpdateTime {
 				mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
+				articleIdArr = append(articleIdArr, v.ArticleId)
 			}
 		}
-	}
-
-	mapHistroyArticleId := make(map[int]int)
-
-	if userId > 0 {
-		listArticleHistory, e := models.GetUserToArticleHistory(userId, industrialIdArr)
+		//时间线的更新时间
+		//	maptimelineUPdateTime := make(map[int]string)
+		listtimelinePublishdate, e := models.GetTimeLineReportIndustrialPublishdateList(industrialIdArr)
 		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("获取产业关联的视频失败，GetindustryVideo " + e.Error())
+			err = e
 			return
 		}
-		for _, v := range listArticleHistory {
-			mapHistroyArticleId[v.ArticleId] = v.ArticleId
+		for _, v := range listtimelinePublishdate {
+			if mapUPdateTime[v.IndustrialManagementId] != "" {
+				if utils.StrTimeToTime(v.PublishDate).After(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
+					mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
+				}
+			}
+		}
+
+		if userId > 0 {
+			listArticleHistory, e := models.GetUserToArticleHistory(userId, industrialIdArr)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("获取产业关联的视频失败，GetindustryVideo " + e.Error())
+				return
+			}
+			for _, v := range listArticleHistory {
+				mapHistroyArticleId[v.ArticleId] = v.ArticleId
+			}
 		}
 	}
 	nowTime := time.Now().Local()

services/keyword.go

@@ -57,6 +57,7 @@ func AddUserSearchLog(user *models.WxUserItem, keyWord string, source int) (err
 	item.CompanyName = user.CompanyName
 	item.RealName = user.RealName
 	item.Source = source
+	item.RegisterPlatform = 2
 	_, err = models.AddSearchKeyWordLog(item)
 	return
 }