Merge branch 'cygx/cygx_12.8' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/user.go

@@ -2074,30 +2074,6 @@ func (this *UserController) CompanyTableDetail() {
 			endDate += " 23:59:59"
 			condition += ` AND r.create_time <= '` + endDate + `' `
 		}
-		//fmt.Println("es 搜索")
-		//totalEs, esList, err := services.SearcCygxArticleHistoryData(utils.IndexNameArticleHistory, keyWord, startDate, endDate, strconv.Itoa(companyId), startSize, pageSize)
-		//var articleIds string
-		//if len(esList) > 0 {
-		//	articleIdMap := make(map[int]int)
-		//	for _, v := range esList {
-		//		if _, ok := articleIdMap[v.Id]; !ok {
-		//			articleIds += strconv.Itoa(v.Id) + ","
-		//			articleIdMap[v.Id] = v.Id
-		//		}
-		//	}
-		//}
-		//articleIds = strings.TrimRight(articleIds, ",")
-		//if articleIds != "" {
-		//	condition = ` AND r.id IN (` + articleIds + `) `
-		//}
-		//condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
-		//total, err = cygx.GetCygxArticleHistoryCountByCompany(condition)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取用户阅读记录总数失败，Err:" + err.Error()
-		//	return
-		//}
-		//total = int(totalEs)
 		condition += "  ORDER BY r.create_time DESC "
 		listRecord, err := cygx.GetCygxArticleAndYanxuanRecordRespList(condition, pars, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -2118,45 +2094,6 @@ func (this *UserController) CompanyTableDetail() {
 			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
 			return
 		}
-		//if len(listRecord) > 0 {
-		//	mapAricleId := make(map[int]int)
-		//	mapAricleIndustrialSubjectName := make(map[int]*cygx.ArticleIndustrialSubjectNameResp)
-		//	for k, v := range list {
-		//		if v.ArticleId >= utils.SummaryArticleId {
-		//			list[k].ArticleType = 1
-		//		} else {
-		//			list[k].ArticleType = 2
-		//		}
-		//		if list[k].PermissionName == "" {
-		//			list[k].PermissionName = v.CategoryName
-		//		}
-		//		if mapAricleId[v.ArticleId] == 0 {
-		//			articleIds += strconv.Itoa(v.ArticleId) + ","
-		//			mapAricleId[v.ArticleId] = v.ArticleId
-		//		}
-		//		list[k].RegisterPlatform = cygxService.GetArticleSourcePlatform(v.SourcePlatform)
-		//	}
-		//	articleIds = strings.TrimRight(articleIds, ",")
-		//	if articleIds != "" {
-		//		listArticleIndustrialSubjectList, err := cygx.GetCygxArticleIndustrialSubjectName(articleIds)
-		//		if err != nil && err.Error() != utils.ErrNoRow() {
-		//			br.Msg = "获取信息失败"
-		//			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
-		//			return
-		//		}
-		//		if len(listArticleIndustrialSubjectList) > 0 {
-		//			for _, v := range listArticleIndustrialSubjectList {
-		//				mapAricleIndustrialSubjectName[v.ArticleId] = v
-		//			}
-		//			for k, v := range list {
-		//				if mapAricleIndustrialSubjectName[v.ArticleId] != nil {
-		//					list[k].IndustryName = mapAricleIndustrialSubjectName[v.ArticleId].IndustryName
-		//					list[k].SubjectNameStr = mapAricleIndustrialSubjectName[v.ArticleId].SubjectNameStr
-		//				}
-		//			}
-		//		}
-		//	}
-		//}
 	} else if source == 2 {
 
 		if isMeeting == "1" {
@@ -2184,7 +2121,6 @@ func (this *UserController) CompanyTableDetail() {
 		if activityName != "" {
 			condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
 		}
-		//condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 		total, err = cygx.GetActivityMeetByCompanyCount(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -2242,7 +2178,6 @@ func (this *UserController) CompanyTableDetail() {
 			}
 		}
 	} else if source == 4 {
-		//condition += ` AND  r.company_id =  ` + strconv.Itoa(companyId) + `  AND r.create_time < date_format(now(),'%Y-%m-%d')` //过滤当天时间
 		list, err = cygx.GetChartCollectList(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -2252,7 +2187,7 @@ func (this *UserController) CompanyTableDetail() {
 		if len(list) > 0 {
 			for k, v := range list {
 				var err error
-				condition = ` AND a.publish_status = 1  AND r.company_id =  ` + strconv.Itoa(companyId) + ` AND  r.mobile =  ` + v.Mobile + `  AND r.create_time < date_format(now(),'%Y-%m-%d')` //过滤当天时间
+				condition = ` AND a.publish_status = 1  AND r.company_id =  ` + strconv.Itoa(companyId) + ` AND  r.mobile =  ` + v.Mobile + `  AND r.create_time  < '` + time.Now().Format(utils.FormatDate) + `' ` //过滤当天时间
 				total, err = cygx.GetChartCountByUserMobile(condition)
 				if err != nil {
 					br.Msg = "获取信息失败"
@@ -2288,7 +2223,7 @@ func (this *UserController) CompanyTableDetail() {
 		}
 
 	} else if source == 5 {
-		condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
+
 		total, err = cygx.GetCygxIndustryFllowCountByCompany(condition)
 		if err != nil {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
@@ -2302,7 +2237,6 @@ func (this *UserController) CompanyTableDetail() {
 			return
 		}
 	} else if source == 6 {
-		condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 		total, err = cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
 		if err != nil {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
@@ -2316,49 +2250,16 @@ func (this *UserController) CompanyTableDetail() {
 			return
 		}
 		if len(list) > 0 {
-			for k, v := range list {
-				var conditionDepartment string
-				var pars []interface{}
-				conditionDepartment += ` WHERE art.source = 1 AND art.is_summary = 1 AND art.department_id =  ` + strconv.Itoa(v.DepartmentId)
-				listArt, errList := cygx.GetSummaryManageList(conditionDepartment, pars, 0, 20)
-				if errList != nil && errList.Error() != utils.ErrNoRow() {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败，Err:" + errList.Error()
-					return
-				}
-				if len(listArt) > 0 {
-					mapIndustryName := make(map[string]string)
-					mapSubjectName := make(map[string]string)
-					var articleIdStr string
-					for _, vArt := range listArt {
-						if vArt.IndustryName != "" && mapIndustryName[vArt.IndustryName] == "" {
-							list[k].IndustryName += vArt.IndustryName + "/"
-							mapIndustryName[vArt.IndustryName] = vArt.IndustryName
-						}
-						articleIdStr += strconv.Itoa(vArt.ArticleId) + ","
-					}
-					list[k].IndustryName = strings.TrimRight(list[k].IndustryName, "/")
-					articleIdStr = strings.TrimRight(articleIdStr, ",")
-					listSubject, err := cygx.GetArticleSubjectList(articleIdStr)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取失败，Err:" + err.Error()
-						return
-					}
-					if len(listSubject) > 0 {
-						for _, vSub := range listSubject {
-							if vSub.SubjectName != "" && mapSubjectName[vSub.SubjectName] == "" {
-								list[k].SubjectNameStr += vSub.SubjectName + "/"
-								mapSubjectName[vSub.SubjectName] = vSub.SubjectName
-							}
-						}
-						list[k].SubjectNameStr = strings.TrimRight(list[k].SubjectNameStr, "/")
-					}
-				}
+			var departmentIds []int
+			for _, v := range list {
+				departmentIds = append(departmentIds, v.DepartmentId)
+			}
+			mapIndustrialLabel := cygxService.GetArticleIndustrialLabelByDepartmentId(departmentIds) // 关联产业
+			for _, v := range list {
+				v.SubjectNameStr = strings.Join(mapIndustrialLabel[v.DepartmentId], "/")
 			}
 		}
 	} else if source == 7 {
-		condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 		total, err = cygx.GetCygxSearchKeyWordCountBuCompany(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -2399,6 +2300,7 @@ func (this *UserController) CompanyTableDetail() {
 		}
 	} else if source == 10 { //标签点击记录
 		condition = ``
+		condition += `  AND a.create_time < '` + time.Now().Format(utils.FormatDate) + `' `
 		if keyWord != "" {
 			condition += ` AND  (a.mobile LIKE '%` + keyWord + `%' OR a.email LIKE '%` + keyWord + `%' OR a.real_name LIKE '%` + keyWord + `%'` + ` OR a.company_name LIKE '%` + keyWord + `%') `
 		}
@@ -3084,7 +2986,6 @@ func (this *UserController) CompanyList() {
 		if activityName != "" {
 			condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
 		}
-		//condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 		total, err = cygx.GetActivityMeetByCompanyCount(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -3244,55 +3145,20 @@ func (this *UserController) CompanyList() {
 		if len(list) > 0 {
 			//根据公司ID获取对应销售
 			var sellerCompanyIds []int
+			var departmentIds []int
 			for _, v := range list {
 				sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+				departmentIds = append(departmentIds, v.DepartmentId)
 			}
-			sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
 
-			for k, v := range list {
+			sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+			mapIndustrialLabel := cygxService.GetArticleIndustrialLabelByDepartmentId(departmentIds) // 关联产业
+			for _, v := range list {
 				v.SellerName = sellNameMap[v.CompanyId]
-				var conditionDepartment string
-				var pars []interface{}
-				conditionDepartment += ` WHERE art.source = 1 AND art.is_summary = 1 AND art.department_id =  ` + strconv.Itoa(v.DepartmentId)
-				listArt, errList := cygx.GetSummaryManageList(conditionDepartment, pars, 0, 20)
-				if errList != nil && errList.Error() != utils.ErrNoRow() {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败，Err:" + errList.Error()
-					return
-				}
-				if len(listArt) > 0 {
-					mapIndustryName := make(map[string]string)
-					mapSubjectName := make(map[string]string)
-					var articleIdStr string
-					for _, vArt := range listArt {
-						if vArt.IndustryName != "" && mapIndustryName[vArt.IndustryName] == "" {
-							list[k].IndustryName += vArt.IndustryName + "/"
-							mapIndustryName[vArt.IndustryName] = vArt.IndustryName
-						}
-						articleIdStr += strconv.Itoa(vArt.ArticleId) + ","
-					}
-					list[k].IndustryName = strings.TrimRight(list[k].IndustryName, "/")
-					articleIdStr = strings.TrimRight(articleIdStr, ",")
-					listSubject, err := cygx.GetArticleSubjectList(articleIdStr)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取失败，Err:" + err.Error()
-						return
-					}
-					if len(listSubject) > 0 {
-						for _, vSub := range listSubject {
-							if vSub.SubjectName != "" && mapSubjectName[vSub.SubjectName] == "" {
-								list[k].SubjectNameStr += vSub.SubjectName + "/"
-								mapSubjectName[vSub.SubjectName] = vSub.SubjectName
-							}
-						}
-						list[k].SubjectNameStr = strings.TrimRight(list[k].SubjectNameStr, "/")
-					}
-				}
+				v.SubjectNameStr = strings.Join(mapIndustrialLabel[v.DepartmentId], "/")
 			}
 		}
 	} else if source == 7 {
-		condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 		total, err = cygx.GetCygxSearchKeyWordCountBuCompany(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -3314,7 +3180,6 @@ func (this *UserController) CompanyList() {
 		for _, v := range list {
 			v.SellerName = sellNameMap[v.CompanyId]
 		}
-
 	} else if source == 8 {
 		total, err = cygx.GetCygxActivitySpecialTripCountByCompany(condition)
 		if err != nil {
@@ -3357,6 +3222,7 @@ func (this *UserController) CompanyList() {
 		if adminId != "" {
 			condition += ` AND p.seller_id IN (` + adminId + `) `
 		}
+		condition += " AND   a.create_time < '" + time.Now().Format(utils.FormatDate) + "' " // 过滤当天查询时间"
 		if keyWord != "" {
 			condition += ` AND  (a.mobile LIKE '%` + keyWord + `%' OR a.email LIKE '%` + keyWord + `%' OR a.real_name LIKE '%` + keyWord + `%'` + ` OR a.company_name LIKE '%` + keyWord + `%') `
 		}
@@ -4172,23 +4038,13 @@ func (this *UserController) TableCompanyList() {
 	if condition != "" {
 		companyCondition += condition
 	}
-
-	//condition = ` AND r.company_id  IN  (   ` + companyCondition + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
-
-	//historyNum, err := cygx.GetCygxArticleHistoryCountByCompany(condition)
-	//if err != nil {
-	//	br.Msg = "获取信息失败"
-	//	br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
-	//	return
-	//}
-	//机构阅读数量太大，先存下来，后面优化
-	detailConfig, err := cygx.GetCygxConfigDetailByCode("company_article_history_num")
+	var pars []interface{}
+	historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount("", pars)
 	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
 		return
 	}
-	var pars []interface{}
 
 	lsitCompany, err := company.GetCompanyProductListBycondition(condition, pars)
 	if err != nil {
@@ -4204,7 +4060,6 @@ func (this *UserController) TableCompanyList() {
 	condition = " AND  r.company_id IN (" + strings.Join(companyIds, ",") + ")"
 	condition += `  AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 
-	historyNum, _ := strconv.Atoi(detailConfig.ConfigValue)
 	//获取参会总数
 	activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
 	if err != nil {

models/cygx/cygx_user_company.go

@@ -135,8 +135,7 @@ func GetActivityMeetByCompany(condition string, startSize, pageSize int) (item [
 		GROUP BY
 			r.id 
 		ORDER BY
-			ui.activity_num DESC ,
-			a.activity_time DESC `
+			a.activity_time DESC ,r.id DESC `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
@@ -191,7 +190,7 @@ func GetCygxArticleCollectByCompany(startSize, pageSize int, condition string) (
 			LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id 
 		WHERE
 			 1=1 ` + condition + ` GROUP BY r.id 
-			ORDER BY ui.article_count_num DESC ,  r.create_time DESC  `
+			ORDER BY r.create_time DESC  `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
@@ -219,9 +218,8 @@ func GetCygxIndustryFllowByCompany(condition string, startSize, pageSize int) (i
 			( SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id ) AS subject_name_str 
 		FROM
 			cygx_industry_fllow AS r
-			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = r.user_id
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
-		WHERE  type = 1 ` + condition + ` ORDER BY ui.industry_fllow_num DESC, r.create_time DESC  LIMIT ?,? `
+		WHERE  type = 1 ` + condition + ` ORDER BY  r.id DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -255,11 +253,10 @@ func GetCygArticleDepartmentFollowByCompany(condition string, startSize, pageSiz
 			cygx_article_department_follow AS r
 			INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id
 			INNER JOIN cygx_article AS a ON a.department_id = m.department_id
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_management AS i ON i.industrial_management_id = mg.industrial_management_id
 			WHERE  r.type = 1 ` + condition + `  GROUP BY 	r.id  
-			ORDER BY  ui.department_follow_num DESC ,	max_time DESC  LIMIT ?,? `
+			ORDER BY 	max_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -282,9 +279,8 @@ func GetCygxSearchKeyWordByCompany(condition string, startSize, pageSize int) (i
 			r.real_name
 		FROM
 			cygx_search_key_word as r
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			WHERE 1= 1 ` + condition + `
-			ORDER BY  ui.key_word_num DESC, r.create_time DESC  LIMIT ?,? `
+			ORDER BY   r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -299,7 +295,7 @@ func GetCygxActivitySpecialTripCountByCompany(condition string) (count int, err
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
 		WHERE
 			1 = 1 
-			 AND a.publish_status = 1 AND a.activity_time_end < NOW()   ` + condition
+			 AND a.publish_status = 1   ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
@@ -320,9 +316,8 @@ func CygxActivitySpecialTripByCompany(condition string, startSize, pageSize int)
 		FROM
 			cygx_activity_special_meeting_detail AS r
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
-			WHERE 1= 1   AND a.publish_status = 1 AND a.activity_time_end < NOW() ` + condition + `
-			ORDER BY  ui.trip_num DESC, r.create_time DESC  LIMIT ?,? `
+			WHERE 1= 1   AND a.publish_status = 1  ` + condition + `
+			ORDER BY  r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -364,38 +359,35 @@ func GetCygxRoadshowByCompany(condition string, startSize, pageSize int) (items
 			r.create_time,
 			r.real_name,
 			r.mobile,
-			ui.roadshow_num,
 			"逻辑解析" AS file_type 
 		FROM
 			cygx_micro_roadshow_video_history AS r
 			INNER JOIN cygx_micro_roadshow_video AS v ON r.video_id = v.video_id
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
+
 		WHERE 1=1 ` + condition + `  UNION ALL
 		SELECT
 			v.video_name AS media_title,
 			r.create_time,
 			r.real_name,
 			r.mobile,
-			ui.roadshow_num,
 			"路演回放" AS file_type 
 		FROM
 			cygx_activity_video_history AS r
 			INNER JOIN cygx_activity_video AS v ON r.video_id = v.video_id
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
+
 		WHERE 1=1 ` + condition + `   UNION ALL
 		SELECT
 			v.voice_name AS media_title,
 			r.create_time,
 			r.real_name,
 			r.mobile,
-			ui.roadshow_num,
 			"路演回放" AS file_type 
 		FROM
 			cygx_activity_voice_history AS r
 			INNER JOIN cygx_activity_voice AS v ON r.activity_id = v.activity_id
-			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
+
 		WHERE 1=1 ` + condition + `  
-		ORDER BY roadshow_num DESC ,create_time DESC   LIMIT ?,? `
+		ORDER BY create_time DESC   LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -451,7 +443,7 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
 		WHERE 1=1 ` + condition + `  
-		ORDER BY 	roadshow_num DESC ,ui_roadshow_num DESC ,create_time DESC  LIMIT ?,? `
+		ORDER BY create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -569,9 +561,8 @@ func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (it
 		GROUP BY
 			r.id 
 		ORDER BY
-			ci.activity_num DESC ,
-			ui.activity_num DESC ,
-			a.activity_time DESC `
+			a.activity_time DESC,
+			r.id DESC `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
@@ -620,7 +611,7 @@ func GetCygxArticleCollectByCompanyList(startSize, pageSize int, condition strin
 			LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id 
 		WHERE
 			 1=1 ` + condition + ` GROUP BY r.id 
-			ORDER BY ui.article_count_num DESC ,ui.article_count_num DESC ,  r.create_time DESC  `
+			ORDER BY  r.create_time DESC  `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
@@ -646,7 +637,7 @@ func GetCygxIndustryFllowByCompanyList(condition string, startSize, pageSize int
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = r.user_id
 			
-		WHERE  type = 1 ` + condition + ` ORDER BY ci.industry_fllow_num DESC,ui.industry_fllow_num DESC, r.create_time DESC  LIMIT ?,? `
+		WHERE  type = 1 ` + condition + ` ORDER BY  r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -678,7 +669,7 @@ func GetCygArticleDepartmentFollowByCompanyList(condition string, startSize, pag
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_management AS i ON i.industrial_management_id = mg.industrial_management_id
 			WHERE  r.type = 1 ` + condition + `  GROUP BY 	r.id  
-			ORDER BY  ci.department_follow_num DESC ,ui.department_follow_num DESC ,	max_time DESC  LIMIT ?,? `
+			ORDER BY  	max_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -697,7 +688,7 @@ func GetCygxSearchKeyWordByCompanyList(condition string, startSize, pageSize int
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			WHERE 1= 1 ` + condition + `
-			ORDER BY  ci.key_word_num DESC,ui.key_word_num DESC, r.create_time DESC  LIMIT ?,? `
+			ORDER BY r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -724,7 +715,7 @@ func GetCygxActivitySpecialTripByCompanyList(condition string, startSize, pageSi
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			WHERE 1= 1 ` + condition + `
-			ORDER BY  ci.trip_num DESC,ui.trip_num DESC, r.create_time DESC  LIMIT ?,? `
+			ORDER BY  r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }

models/cygx/tag_history.go

@@ -84,8 +84,7 @@ WHERE a.user_id=? ORDER BY a.create_time DESC LIMIT ?,? `
 // 获取数量
 func GetCygxTagHistoryCountByCompanyId(companyId int, condition string) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM (SELECT b.* FROM cygx_tag_history as a 
-	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
-	LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id `
+	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id  `
 	if condition != "" {
 		sqlCount += condition
 	}
@@ -97,16 +96,15 @@ func GetCygxTagHistoryCountByCompanyId(companyId int, condition string) (count i
 
 // 获取数量
 func GetCygxTagHistoryByCompanyId(companyId, startSize, pageSize int, condition string) (list []*UserInteraction, err error) {
-	sqlCount := ` SELECT a.real_name,a.mobile,ui.tag_num, a.create_time AS create_time,
+	sqlCount := ` SELECT a.real_name,a.mobile, a.create_time AS create_time,
 b.tag_id,b.tag_name,b.article_types,b.activity_types,b.industries,b.subject_names   
 FROM cygx_tag_history as a 
-	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id  
-	LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id `
+	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id `
 	if condition != "" {
 		sqlCount += condition
 	}
 	sqlCount += ` 
-	WHERE a.company_id=? ORDER BY tag_num DESC ,create_time DESC LIMIT ?,? `
+	WHERE a.company_id=? ORDER BY  create_time DESC LIMIT ?,? `
 	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, companyId, startSize, pageSize).QueryRows(&list)
 	return
@@ -144,7 +142,7 @@ LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE 1=1 `
 	if condition != "" {
 		sqlCount += condition
 	}
-	sqlCount += ` ORDER BY tag_num DESC ,ui_tag_num DESC , create_time DESC LIMIT ?,? `
+	sqlCount += `  ORDER BY  create_time DESC LIMIT ?,? `
 	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, startSize, pageSize).QueryRows(&list)
 	return

services/cygx/article.go

@@ -98,6 +98,9 @@ func GetArticleSourcePlatform(SourcePlatform string) (sourcePlatformResp int) {
 
 // 根据文章ID获取文章关联的产业名称
 func GetArticleIndustrialLabelByArticleId(articleIds []int) (respMap map[int][]string) {
+	if len(articleIds) == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -118,6 +121,9 @@ func GetArticleIndustrialLabelByArticleId(articleIds []int) (respMap map[int][]s
 
 // 根据文章ID获取文章关联的标的名称
 func GetArticleSubjectLabelByArticleId(articleIds []int) (respMap map[int][]string) {
+	if len(articleIds) == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -137,6 +143,55 @@ func GetArticleSubjectLabelByArticleId(articleIds []int) (respMap map[int][]stri
 	return
 }
 
+// 根据作者ID获取关联的文章下面的产业名称
+func GetArticleIndustrialLabelByDepartmentId(departmentIds []int) (respMap map[int][]string) {
+	lenArr := len(departmentIds)
+	if lenArr == 0 {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("根据文章ID获取文章关联的产业名称失败 GetArticleIndustrialLabelByDepartmentId departmentIds: ", departmentIds, err.Error()), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition = " AND department_id IN(" + utils.GetOrmInReplace(lenArr) + ")  ORDER BY publish_date DESC "
+	pars = append(pars, departmentIds)
+	//获取作者关联的文章
+	listArticle, e := cygx.GetArticlList(condition, pars, 0, 9999)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetArticlList, Err: " + e.Error())
+		return
+	}
+	var articleIds []int
+	for _, v := range listArticle {
+		articleIds = append(articleIds, v.ArticleId)
+	}
+	//获取文章关联的产业
+	list, e := cygx.GetIndustrialArticleGroupListByarticleIdsArr(articleIds)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetIndustrialArticleGroupListByarticleIdsArr, Err: " + e.Error())
+		return
+	}
+	respMap = make(map[int][]string, 0)
+
+	artMap := make(map[int][]string)
+	for _, v := range list {
+		artMap[v.ArticleId] = append(respMap[v.ArticleId], v.IndustryName)
+	}
+
+	//建立作者与文章、产业的关系
+	for _, v := range listArticle {
+		if len(artMap[v.ArticleId]) == 0 {
+			continue
+		}
+		respMap[v.DepartmentId] = append(respMap[v.DepartmentId], strings.Join(artMap[v.ArticleId], "/"))
+	}
+	return
+}
+
 // 处理文章、研选专栏的查询信息回显
 func HandleArticleAndYanxuanRecordList(items []*cygx.CygxArticleAndYanxuanRecordResp) (itemsResp []*cygx.UserInteraction, err error) {
 	itemsResp = make([]*cygx.UserInteraction, 0)
@@ -144,6 +199,7 @@ func HandleArticleAndYanxuanRecordList(items []*cygx.CygxArticleAndYanxuanRecord
 
 		var articleIds []int        // 文章ID
 		var yanxuanSpecialIds []int // 研选专栏ID
+		var sellerCompanyIds []int  // 公司ID
 		for _, v := range items {
 			if v.Source == utils.CYGX_OBJ_ARTICLE {
 				articleIds = append(articleIds, v.SourceId)
@@ -151,7 +207,11 @@ func HandleArticleAndYanxuanRecordList(items []*cygx.CygxArticleAndYanxuanRecord
 			if v.Source == utils.CYGX_OBJ_YANXUANSPECIAL {
 				yanxuanSpecialIds = append(yanxuanSpecialIds, v.SourceId)
 			}
+			sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
 		}
+
+		sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
 		mapIndustrialLabel := GetArticleIndustrialLabelByArticleId(articleIds) // 关联产业
 		mapSubjectLabel := GetArticleSubjectLabelByArticleId(articleIds)       // 关联标的
 		var condition string
@@ -224,6 +284,12 @@ func HandleArticleAndYanxuanRecordList(items []*cygx.CygxArticleAndYanxuanRecord
 			}
 			item.ArticleId = v.SourceId
 			item.CreateTime = v.CreateTime
+			item.UserId = v.UserId
+			item.RealName = v.RealName
+			item.Mobile = v.Mobile
+			item.CompanyId = v.CompanyId
+			item.CompanyName = v.CompanyName
+			item.SellerName = sellNameMap[v.CompanyId]
 			item.RegisterPlatform = v.RegisterPlatform
 			itemsResp = append(itemsResp, item)
 		}