Merge branch 'cygx/cygx_need_p1-877' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/user.go

@@ -396,6 +396,11 @@ func (this *UserController) List() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+	var isAdminRole bool
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
+	}
 	var userIds string
 	var userIdArr []int
 	if list != nil {
@@ -428,6 +433,10 @@ func (this *UserController) List() {
 			}
 			userIds += strconv.Itoa(int(v.UserId)) + ","
 			userIdArr = append(userIdArr, int(v.UserId))
+
+			if !isAdminRole {
+				list[k].CompanyInteractionNum = v.CompanyInteractionNumSeller
+			}
 		}
 		userIds = strings.TrimRight(userIds, ",")
 		splitList, err := cygx.GetCygxCompanyUserListSplit(userIds)
@@ -1653,6 +1662,7 @@ func (this *UserController) ExportInteraction() {
 		br.Msg = "获取信息失败"
 		return
 	}
+
 	mobile := wxUser.Mobile
 	var list []*cygx.UserInteraction
 
@@ -1668,7 +1678,19 @@ func (this *UserController) ExportInteraction() {
 			endDate += " 23:59:59"
 			condition += ` AND r.create_time <= '` + endDate + `' `
 		}
-		list, err = cygx.GetCygxArticleHistoryRecordByUser(wxUser.Mobile, wxUser.Email, condition, 0, 0)
+
+		if wxUser.Mobile == "" {
+			wxUser.Mobile = wxUser.Email
+		}
+		//total, err = cygx.GetCygxArticleHistoryCount(wxUser.Mobile, wxUser.Email, condition)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取用户阅读记录总数失败，Err:" + err.Error()
+		//	return
+		//}
+
+		condition += " 	AND (r.mobile = '" + wxUser.Mobile + "'  OR  r.email = '" + wxUser.Mobile + "')  "
+		_, list, err = cygx.GetCygxArticleHistoryRecordByUserNew(condition, 0, 9999)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
@@ -1902,6 +1924,13 @@ func (this *UserController) CompanyTableList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+	resp := new(cygx.CygxUserTableListRep)
+	var isAdminRole bool
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
+	}
+
 	var pars []interface{}
 	condition := ` AND r.company_id  IN  (   ` + strconv.Itoa(companyId) + `  ) AND r.create_time < '` + time.Now().Format(utils.FormatDate) + `' ` //过滤当天时间
 	//totalEs, _, err := services.SearcCygxArticleHistoryData(utils.IndexNameArticleHistory, "", "", "", strconv.Itoa(companyId), 0, 0)
@@ -1910,89 +1939,168 @@ func (this *UserController) CompanyTableList() {
 	//	br.ErrMsg = "获取Es文章阅读数量失败，Err:" + err.Error()
 	//	return
 	//}
-	historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount(condition, pars)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
-		return
-	}
 
-	//historyNum := int(totalEs)
-	//historyNum, err := cygx.GetCygxArticleHistoryCountByCompany(condition)
-	//获取参会总数
-	activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
-		return
-	}
-	//获取用户收藏记录总数
-	articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
-		return
-	}
-	//获取用户关注总数
-	industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败 "
-		br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
-		return
-	}
-	//获取关注作者总数
-	departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
-		return
-	}
-	//获取搜索记录
-	keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
+	if isAdminRole {
+		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount(condition, pars)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+			return
+		}
 
-	chartNum, err := cygx.GetChartCountByUserMobile(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取总数失败，Err:" + err.Error()
-		return
-	}
+		activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户收藏记录总数
+		articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户关注总数
+		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败 "
+			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
+			return
+		}
+		//获取关注作者总数
+		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
+			return
+		}
+		//获取搜索记录
+		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
 
-	triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
+		chartNum, err := cygx.GetChartCountByUserMobile(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取总数失败，Err:" + err.Error()
+			return
+		}
 
-	roadshowTotal, err := cygx.GetCygxRoadshowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
-	tagNum, err := cygx.GetCygxTagHistoryCountByCompanyId(companyId, "")
-	if err != nil {
-		br.ErrMsg = "获取信息失败，Err:" + err.Error()
-		br.Msg = "获取搜索记录失败"
-		return
+		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+		tagNum, err := cygx.GetCygxTagHistoryCount(condition)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取搜索记录失败"
+			return
+		}
+		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
+			{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
+			{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
+			{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
+			{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
+			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
+			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
+			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+		resp.List = List
+	} else {
+		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCountWeekly(condition, pars)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+			return
+		}
+		activityNum, err := cygx.GetActivityMeetByCompanyCountWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户收藏记录总数
+		articleCollect, err := cygx.GetCygxArticleCollectCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户关注总数
+		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败 "
+			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
+			return
+		}
+		//获取关注作者总数
+		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
+			return
+		}
+		//获取搜索记录
+		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		chartNum, err := cygx.GetChartCountByUserMobileWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取总数失败，Err:" + err.Error()
+			return
+		}
+
+		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+		tagNum, err := cygx.GetCygxTagHistoryCountWeekly(condition)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取搜索记录失败"
+			return
+		}
+		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
+			{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
+			{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
+			{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
+			{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
+			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
+			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
+			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+		resp.List = List
 	}
-	List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
-		{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
-		{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
-		{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
-		{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
-		{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
-		{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
-		{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
-		{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
-		{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
-	resp := new(cygx.CygxUserTableListRep)
-	resp.List = List
+
 	resp.ComapnyName = comanyDetail.CompanyName
 	br.Ret = 200
 	br.Success = true
@@ -2441,32 +2549,32 @@ 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 + `%') `
-		}
+		//condition = ``
+		//condition += `  AND r.create_time < '` + time.Now().Format(utils.FormatDate) + `' `
+		//if keyWord != "" {
+		//	condition += ` AND  (r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%'` + ` OR r.company_name LIKE '%` + keyWord + `%') `
+		//}
 		if isAdminRole {
-			total, err = cygx.GetCygxTagHistoryCountByCompanyId(companyId, condition)
+			total, err = cygx.GetCygxTagHistoryCount(condition)
 			if err != nil {
 				br.ErrMsg = "获取信息失败，Err:" + err.Error()
 				br.Msg = "获取搜索记录失败"
 				return
 			}
-			list, err = cygx.GetCygxTagHistoryByCompanyId(companyId, startSize, pageSize, condition)
+			list, err = cygx.GetCygxTagHistoryListBycondition(condition, startSize, pageSize)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.ErrMsg = "获取信息失败，Err:" + err.Error()
 				br.Msg = "获取搜索记录列表失败"
 				return
 			}
 		} else {
-			total, err = cygx.GetCygxTagHistoryCountByCompanyIdWeekly(companyId, condition)
+			total, err = cygx.GetCygxTagHistoryCountWeekly(condition)
 			if err != nil {
 				br.ErrMsg = "获取信息失败，Err:" + err.Error()
 				br.Msg = "获取搜索记录失败"
 				return
 			}
-			list, err = cygx.GetCygxTagHistoryByCompanyIdWeekly(companyId, startSize, pageSize, condition)
+			list, err = cygx.GetCygxTagHistoryListByconditionWeekly(condition, startSize, pageSize)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.ErrMsg = "获取信息失败，Err:" + err.Error()
 				br.Msg = "获取搜索记录列表失败"
@@ -2532,7 +2640,12 @@ func (this *UserController) CompanyExportInteraction() {
 		br.ErrMsg = "GetCompanyById，Err:" + err.Error()
 		return
 	}
-
+	var isAdminRole bool
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
+	}
+	var pageSize = 9999
 	var list []*cygx.UserInteraction
 
 	var condition string
@@ -2550,7 +2663,26 @@ func (this *UserController) CompanyExportInteraction() {
 			endDate += " 23:59:59"
 			condition += ` AND r.create_time <= '` + endDate + `' `
 		}
-		list, err = cygx.GetCygxArticleHistoryRecordByCompany(condition, 0, 0)
+
+		var pars []interface{}
+		var listRecord []*cygx.CygxArticleAndYanxuanRecordResp
+		if isAdminRole {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespList(condition, pars, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		} else {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespListWeekly(condition, pars, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		}
+		//处理查询信息回显
+		list, err = cygxService.HandleArticleAndYanxuanRecordList(listRecord)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
@@ -2619,11 +2751,20 @@ func (this *UserController) CompanyExportInteraction() {
 		if activityName != "" {
 			condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
 		}
-		list, err = cygx.GetActivityMeetByCompany(condition, 0, 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取参会人数列表失败"
-			return
+		if isAdminRole {
+			list, err = cygx.GetActivityMeetByCompany(condition, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
+		} else {
+			list, err = cygx.GetActivityMeetByCompanyWeekly(condition, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
 		}
 		if len(list) > 0 {
 			for k, v := range list {
@@ -3085,6 +3226,11 @@ func (this *UserController) CompanyList() {
 	if keyWord != "" {
 		condition += ` AND  (r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%'` + ` OR r.company_name LIKE '%` + keyWord + `%') `
 	}
+	var isAdminRole bool
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
+	}
 	if source == 1 {
 		if startDate != "" {
 			startDate += " 00:00:00"
@@ -3097,18 +3243,35 @@ func (this *UserController) CompanyList() {
 		}
 		var pars []interface{}
 		condition += "  ORDER BY r.create_time DESC "
-		listRecord, err := cygx.GetCygxArticleAndYanxuanRecordRespList(condition, pars, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
-			return
-		}
-		total, err = cygx.GetCygxArticleAndYanxuanRecordCount(condition, pars)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
-			return
+		var listRecord []*cygx.CygxArticleAndYanxuanRecordResp
+		if isAdminRole {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespList(condition, pars, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+			total, err = cygx.GetCygxArticleAndYanxuanRecordCount(condition, pars)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespListWeekly(condition, pars, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+			total, err = cygx.GetCygxArticleAndYanxuanRecordCountWeekly(condition, pars)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+				return
+			}
 		}
+
 		//处理查询信息回显
 		list, err = cygxService.HandleArticleAndYanxuanRecordList(listRecord)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -3143,17 +3306,32 @@ func (this *UserController) CompanyList() {
 		if activityName != "" {
 			condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
 		}
-		total, err = cygx.GetActivityMeetByCompanyCount(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
-			return
-		}
-		list, err = cygx.GetActivityMeetByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取参会人数列表失败"
-			return
+		if isAdminRole {
+			total, err = cygx.GetActivityMeetByCompanyCount(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetActivityMeetByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
+		} else {
+			total, err = cygx.GetActivityMeetByCompanyCountWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetActivityMeetByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
 		}
 		//根据公司ID获取对应销售
 		var sellerCompanyIds []int
@@ -3182,17 +3360,32 @@ func (this *UserController) CompanyList() {
 			}
 		}
 	} else if source == 3 {
-		total, err = cygx.GetCygxArticleCollectCountByCompany(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
-			return
-		}
-		list, err = cygx.GetCygxArticleCollectByCompanyList(startSize, pageSize, condition)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户搜藏记录失败，Err:" + err.Error()
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygxArticleCollectCountByCompany(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxArticleCollectByCompanyList(startSize, pageSize, condition)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户搜藏记录失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxArticleCollectCountByCompanyWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxArticleCollectByCompanyWeekly(startSize, pageSize, condition)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户搜藏记录失败，Err:" + err.Error()
+				return
+			}
 		}
 		//根据公司ID获取对应销售
 		var sellerCompanyIds []int
@@ -3212,18 +3405,34 @@ func (this *UserController) CompanyList() {
 			}
 		}
 	} else if source == 4 {
-		total, err = cygx.GetChartCountByUserCount(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取总数失败，Err:" + err.Error()
-			return
-		}
-		//condition += ` AND  r.company_id =  ` + strconv.Itoa(companyId) + `  AND r.create_time < date_format(now(),'%Y-%m-%d')` //过滤当天时间
-		list, err = cygx.GetChartCollectBycompanyList(condition, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			return
+		if isAdminRole {
+			total, err = cygx.GetChartCountByUserCount(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取总数失败，Err:" + err.Error()
+				return
+			}
+			//condition += ` AND  r.company_id =  ` + strconv.Itoa(companyId) + `  AND r.create_time < date_format(now(),'%Y-%m-%d')` //过滤当天时间
+			list, err = cygx.GetChartCollectBycompanyList(condition, startSize, pageSize)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, err = cygx.GetChartCountByUserMobileWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取总数失败，Err:" + err.Error()
+				return
+			}
+			//condition += ` AND  r.company_id =  ` + strconv.Itoa(companyId) + `  AND r.create_time < date_format(now(),'%Y-%m-%d')` //过滤当天时间
+			list, err = cygx.GetChartCollectBycompanyListWeekly(condition, startSize, pageSize)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				return
+			}
 		}
 		if len(list) > 0 {
 			for k, v := range list {
@@ -3264,17 +3473,32 @@ func (this *UserController) CompanyList() {
 		}
 
 	} else if source == 5 {
-		total, err = cygx.GetCygxIndustryFllowCountByCompany(condition)
-		if err != nil {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取用户关注总数失败"
-			return
-		}
-		list, err = cygx.GetCygxIndustryFllowByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取用户关注总数失败"
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygxIndustryFllowCountByCompany(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取用户关注总数失败"
+				return
+			}
+			list, err = cygx.GetCygxIndustryFllowByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取用户关注总数失败"
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxIndustryFllowCountByCompanyWeekly(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取用户关注总数失败"
+				return
+			}
+			list, err = cygx.GetCygxIndustryFllowByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取用户关注总数失败"
+				return
+			}
 		}
 		//根据公司ID获取对应销售
 		var sellerCompanyIds []int
@@ -3287,17 +3511,32 @@ func (this *UserController) CompanyList() {
 		}
 
 	} else if source == 6 {
-		total, err = cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
-		if err != nil {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取关注作者总数失败"
-			return
-		}
-		list, err = cygx.GetCygArticleDepartmentFollowByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取关注作者列表失败"
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取关注作者总数失败"
+				return
+			}
+			list, err = cygx.GetCygArticleDepartmentFollowByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取关注作者列表失败"
+				return
+			}
+		} else {
+			total, err = cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取关注作者总数失败"
+				return
+			}
+			list, err = cygx.GetCygArticleDepartmentFollowByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取关注作者列表失败"
+				return
+			}
 		}
 		if len(list) > 0 {
 			//根据公司ID获取对应销售
@@ -3316,17 +3555,32 @@ func (this *UserController) CompanyList() {
 			}
 		}
 	} else if source == 7 {
-		total, err = cygx.GetCygxSearchKeyWordCountBuCompany(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-			return
-		}
-		list, err = cygx.GetCygxSearchKeyWordByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygxSearchKeyWordCountBuCompany(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxSearchKeyWordByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxSearchKeyWordCountBuCompanyWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxSearchKeyWordByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
 		}
 		//根据公司ID获取对应销售
 		var sellerCompanyIds []int
@@ -3338,30 +3592,60 @@ func (this *UserController) CompanyList() {
 			v.SellerName = sellNameMap[v.CompanyId]
 		}
 	} else if source == 8 {
-		total, err = cygx.GetCygxActivitySpecialTripCountByCompany(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-			return
-		}
-		list, err = cygx.GetCygxActivitySpecialTripByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygxActivitySpecialTripCountByCompany(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxActivitySpecialTripByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxActivitySpecialTripCountByCompanyWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.CygxActivitySpecialTripByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
 		}
 	} else if source == 9 {
-		total, err = cygx.GetCygxRoadshowCountByCompany(condition)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-			return
-		}
-		list, err = cygx.GetCygxRoadshowByCompanyList(condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
-			return
+		if isAdminRole {
+			total, err = cygx.GetCygxRoadshowCountByCompany(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxRoadshowByCompanyList(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxRoadshowCountByCompanyWeekly(condition)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+				return
+			}
+			list, err = cygx.GetCygxRoadshowByCompanyWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
+				return
+			}
 		}
 
 		//根据公司ID获取对应销售
@@ -3375,25 +3659,40 @@ func (this *UserController) CompanyList() {
 		}
 
 	} else if source == 10 { //标签点击记录
-		condition = ``
-		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 + `%') `
-		}
-		total, err = cygx.GetCygxTagHistoryCountByCompanyIds(companyIds, condition)
-		if err != nil {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取搜索记录失败"
-			return
-		}
-		list, err = cygx.GetCygxTagHistoryByCompanyIds(companyIds, condition, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取搜索记录列表失败"
-			return
+		//condition = ``
+		//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 + `%') `
+		//}
+		if isAdminRole {
+			total, err = cygx.GetCygxTagHistoryCount(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取搜索记录失败"
+				return
+			}
+			list, err = cygx.GetCygxTagHistoryListBycondition(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取搜索记录列表失败"
+				return
+			}
+		} else {
+			total, err = cygx.GetCygxTagHistoryCountWeekly(condition)
+			if err != nil {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取搜索记录失败"
+				return
+			}
+			list, err = cygx.GetCygxTagHistoryListByconditionWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取搜索记录列表失败"
+				return
+			}
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
@@ -3690,6 +3989,12 @@ func (this *UserController) CompanyExportInteractionList() {
 	if keyWord != "" {
 		condition += ` AND  (r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%'` + ` OR r.company_name LIKE '%` + keyWord + `%') `
 	}
+	var isAdminRole bool
+	var pageSize = 9999
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
+	}
 	if source == 1 {
 		if startDate != "" {
 			startDate += " 00:00:00"
@@ -3700,7 +4005,25 @@ func (this *UserController) CompanyExportInteractionList() {
 			endDate += " 23:59:59"
 			condition += ` AND r.create_time <= '` + endDate + `' `
 		}
-		list, err = cygx.GetCygxArticleHistoryRecordByCompanyList(condition, 0, 0)
+		var pars []interface{}
+		var listRecord []*cygx.CygxArticleAndYanxuanRecordResp
+		if isAdminRole {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespList(condition, pars, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		} else {
+			listRecord, err = cygx.GetCygxArticleAndYanxuanRecordRespListWeekly(condition, pars, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		}
+		//处理查询信息回显
+		list, err = cygxService.HandleArticleAndYanxuanRecordList(listRecord)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
@@ -3770,11 +4093,20 @@ func (this *UserController) CompanyExportInteractionList() {
 		if activityName != "" {
 			condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
 		}
-		list, err = cygx.GetActivityMeetByCompanyList(condition, 0, 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			br.Msg = "获取参会人数列表失败"
-			return
+		if isAdminRole {
+			list, err = cygx.GetActivityMeetByCompany(condition, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
+		} else {
+			list, err = cygx.GetActivityMeetByCompanyWeekly(condition, 0, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				br.Msg = "获取参会人数列表失败"
+				return
+			}
 		}
 		if len(list) > 0 {
 			for k, v := range list {
@@ -4195,14 +4527,13 @@ func (this *UserController) TableCompanyList() {
 	if condition != "" {
 		companyCondition += condition
 	}
-	var pars []interface{}
-	historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount("", pars)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
-		return
+	resp := new(cygx.CygxUserTableListRep)
+	var isAdminRole bool
+	//如果不是管理员身份或者研究员身份则需要添加可见范围处理
+	if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
+		isAdminRole = true
 	}
-
+	var pars []interface{}
 	lsitCompany, err := company.GetCompanyProductListBycondition(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -4217,80 +4548,170 @@ func (this *UserController) TableCompanyList() {
 	condition = " AND  r.company_id IN (" + strings.Join(companyIds, ",") + ")"
 	condition += `  AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 
-	//获取参会总数
-	activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
-		return
-	}
-	//获取用户收藏记录总数
-	articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
-		return
-	}
-	//获取用户关注总数
-	industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败 "
-		br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
-		return
-	}
-	//获取关注作者总数
-	departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
-		return
-	}
-	//获取搜索记录
-	keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
+	if isAdminRole {
+		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount("", pars)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+			return
+		}
 
-	chartNum, err := cygx.GetChartCountByUserMobile(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取总数失败，Err:" + err.Error()
-		return
-	}
+		//获取参会总数
+		activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户收藏记录总数
+		articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户关注总数
+		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败 "
+			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
+			return
+		}
+		//获取关注作者总数
+		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
+			return
+		}
+		//获取搜索记录
+		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
 
-	triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
+		chartNum, err := cygx.GetChartCountByUserMobile(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取总数失败，Err:" + err.Error()
+			return
+		}
 
-	roadshowTotal, err := cygx.GetCygxRoadshowCountByCompany(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
-		return
-	}
-	tagNum, err := cygx.GetCygxTagHistoryCountByCompanyIds(strings.Join(companyIds, ","), "")
-	if err != nil {
-		br.ErrMsg = "获取信息失败，Err:" + err.Error()
-		br.Msg = "获取搜索记录失败"
-		return
+		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompany(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+		tagNum, err := cygx.GetCygxTagHistoryCount(condition)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取搜索记录失败"
+			return
+		}
+		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
+			{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
+			{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
+			{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
+			{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
+			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
+			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
+			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+
+		resp.List = List
+	} else {
+		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCountWeekly("", pars)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
+			return
+		}
+
+		//获取参会总数
+		activityNum, err := cygx.GetActivityMeetByCompanyCountWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户收藏记录总数
+		articleCollect, err := cygx.GetCygxArticleCollectCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
+			return
+		}
+		//获取用户关注总数
+		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败 "
+			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
+			return
+		}
+		//获取关注作者总数
+		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
+			return
+		}
+		//获取搜索记录
+		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		chartNum, err := cygx.GetChartCountByUserMobileWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取总数失败，Err:" + err.Error()
+			return
+		}
+
+		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+
+		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompanyWeekly(condition)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
+			return
+		}
+		tagNum, err := cygx.GetCygxTagHistoryCountWeekly(condition)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取搜索记录失败"
+			return
+		}
+		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
+			{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
+			{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
+			{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
+			{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
+			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
+			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
+			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+		resp.List = List
 	}
-	List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
-		{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
-		{PermissionName: "专项调研", Source: 8, TotalNum: triptotal},
-		{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
-		{PermissionName: "收藏图表", Source: 4, TotalNum: chartNum},
-		{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
-		{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
-		{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
-		{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
-		{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
-	resp := new(cygx.CygxUserTableListRep)
-	resp.List = List
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/cygx/chart.go

@@ -263,6 +263,20 @@ func GetChartCountByUserMobile(condition string) (count int, err error) {
 	return
 }
 
+func GetChartCountByUserMobileWeekly(condition string) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	databaseName := utils.GetWeeklyDatabase()
+	sql := `SELECT COUNT(1) AS count FROM cygx_chart_collect as r  INNER JOIN cygx_chart_all AS a ON a.chart_id = r.chart_id
+			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+WHERE 1= 1 `
+	sql = fmt.Sprintf(sql, databaseName)
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}
+
 type CygxChartCollect struct {
 	Mobile string `description:"手机号"`
 	UserId int    `description:"手机号"`
@@ -293,14 +307,6 @@ func GetChartCollectListWeekly(condition string) (items []*UserInteraction, err
 // 获取图表列表
 func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	//sql := `SELECT u.mobile,u.user_id,u.real_name,r.company_name,
-	//		cp.seller_name FROM cygx_chart_collect AS r
-	//		INNER JOIN wx_user AS u ON u.user_id = r.user_id
-	//		INNER  JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
-	//		LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
-	//		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
-	//		WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ci.chart_count_num DESC , ui.chart_count_num DESC `
-
 	sql := `SELECT r.*
 			FROM cygx_chart_collect AS r
 			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile   `
@@ -311,6 +317,23 @@ func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (it
 	return
 }
 
+// 获取图表列表
+func GetChartCollectBycompanyListWeekly(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	databaseName := utils.GetWeeklyDatabase()
+	sql := `SELECT r.*
+			FROM cygx_chart_collect AS r
+		    INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2
+			WHERE 1= 1 `
+	sql = fmt.Sprintf(sql, databaseName)
+	sql += `   GROUP BY r.mobile   `
+	if startSize > 0 || pageSize > 0 {
+		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
+	}
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // 获取一共有多少用户收藏图表
 func GetChartCountByUserCount(condition string) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")

models/cygx/cygx_user.go

@@ -10,42 +10,43 @@ import (
 )
 
 type CygxCompanyUser struct {
-	UserId                int64  `orm:"column(user_id);pk"`
-	Mobile                string `description:"手机号"`
-	Email                 string `description:"邮箱"`
-	CompanyId             int    `description:"公司id"`
-	CompanyName           string `description:"公司名称"`
-	RealName              string `description:"姓名"`
-	CreatedTime           string `description:"创建时间"`
-	IsMaker               int    `description:"是否决策人，1:是，0:否"`
-	IsRegister            bool   `description:"是否注册,true:已注册，false:未注册"`
-	Status                string `description:"客户状态"`
-	RegisterTime          string `description:"注册时间"`
-	SellerName            string `description:"销售名称"`
-	InteractionNum        int    `description:"互动量"`
-	CompanyInteractionNum int    `description:"企业互动量"`
-	Labels                string `description:"标签，用英文,隔开"`
-	ActivityLabel         string `description:"活动标签，用英文,隔开"`
-	IsShowSee             bool   `description:"是否展示查看"`
-	IsShowSeeNum          int    `description:"是否展示查看"`
-	HistoryNum            int    `description:"报告阅读"`
-	CountNum              int    `description:"报告收藏"`
-	IndustryFllowNum      int    `description:"产业关注"`
-	DepartmentFollowNum   int    `description:"作者关注"`
-	KeyWordNum            int    `description:"搜索关键词"`
-	OnLineNum             int    `description:"线上互动活动"`
-	OfficeNum             int    `description:"线下互动活动"`
-	ChartNum              int    `description:"图表收藏数量"`
-	TripNum               int    `description:"图表数量"`
-	RoadshowVideoNum      int    `description:"产业视频播放量"`
-	ActivityVideoNum      int    `description:"活动视频播放量"`
-	ActivityVoiceNum      int    `description:"活动音频播放量"`
-	YanxuanspecialNum     int    `description:"研选专栏查看数量"`
-	PackageType           int    `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
-	TryStage              int    `description:"试用客户子标签：0全部、1未分类、2 推进、3 跟踪、4 预备"`
-	Content               string `description:"备注信息"`
-	IsRemind              bool   `description:"是否添加互动提醒"`
-	IsSubscribeCygx       int    `description:"是否关注了查研观向微信公众号: 0-未关注; 1-已关注"`
+	UserId                      int64  `orm:"column(user_id);pk"`
+	Mobile                      string `description:"手机号"`
+	Email                       string `description:"邮箱"`
+	CompanyId                   int    `description:"公司id"`
+	CompanyName                 string `description:"公司名称"`
+	RealName                    string `description:"姓名"`
+	CreatedTime                 string `description:"创建时间"`
+	IsMaker                     int    `description:"是否决策人，1:是，0:否"`
+	IsRegister                  bool   `description:"是否注册,true:已注册，false:未注册"`
+	Status                      string `description:"客户状态"`
+	RegisterTime                string `description:"注册时间"`
+	SellerName                  string `description:"销售名称"`
+	InteractionNum              int    `description:"互动量"`
+	CompanyInteractionNum       int    `description:"企业互动量"`
+	CompanyInteractionNumSeller int    `description:"销售可见企业互动量"`
+	Labels                      string `description:"标签，用英文,隔开"`
+	ActivityLabel               string `description:"活动标签，用英文,隔开"`
+	IsShowSee                   bool   `description:"是否展示查看"`
+	IsShowSeeNum                int    `description:"是否展示查看"`
+	HistoryNum                  int    `description:"报告阅读"`
+	CountNum                    int    `description:"报告收藏"`
+	IndustryFllowNum            int    `description:"产业关注"`
+	DepartmentFollowNum         int    `description:"作者关注"`
+	KeyWordNum                  int    `description:"搜索关键词"`
+	OnLineNum                   int    `description:"线上互动活动"`
+	OfficeNum                   int    `description:"线下互动活动"`
+	ChartNum                    int    `description:"图表收藏数量"`
+	TripNum                     int    `description:"图表数量"`
+	RoadshowVideoNum            int    `description:"产业视频播放量"`
+	ActivityVideoNum            int    `description:"活动视频播放量"`
+	ActivityVoiceNum            int    `description:"活动音频播放量"`
+	YanxuanspecialNum           int    `description:"研选专栏查看数量"`
+	PackageType                 int    `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
+	TryStage                    int    `description:"试用客户子标签：0全部、1未分类、2 推进、3 跟踪、4 预备"`
+	Content                     string `description:"备注信息"`
+	IsRemind                    bool   `description:"是否添加互动提醒"`
+	IsSubscribeCygx             int    `description:"是否关注了查研观向微信公众号: 0-未关注; 1-已关注"`
 }
 
 type CompanyUserListResp struct {
@@ -106,6 +107,7 @@ func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition,
 			c.company_name,
 			c.company_id,
 			c.interaction_num as company_interaction_num,
+			c.interaction_num_seller as company_interaction_num_seller,
 			cp.status,
 			cp.try_stage,
 			cp.package_type,

models/cygx/cygx_user_company.go

@@ -919,8 +919,6 @@ func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (it
 			cygx_activity_signup_detail AS r
 			INNER  JOIN cygx_activity AS a ON a.activity_id = r.activity_id
 			INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id
-			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 
 			AND r.do_fail_type = 0

models/cygx/tag_history.go

@@ -1,6 +1,7 @@
 package cygx
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hz_crm_api/utils"
 	"time"
@@ -32,16 +33,16 @@ func GetCygxTagHistoryList(condition string, pars []interface{}) (items []*CygxT
 	return
 }
 
-// 获取数量
-func GetCygxTagHistoryCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as art WHERE 1= 1  `
-	if condition != "" {
-		sqlCount += condition
-	}
-	o := orm.NewOrmUsingDB("hz_cygx")
-	err = o.Raw(sqlCount, pars).QueryRow(&count)
-	return
-}
+//// 获取数量
+//func GetCygxTagHistoryCount(condition string, pars []interface{}) (count int, err error) {
+//	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as art WHERE 1= 1  `
+//	if condition != "" {
+//		sqlCount += condition
+//	}
+//	o := orm.NewOrmUsingDB("hz_cygx")
+//	err = o.Raw(sqlCount, pars).QueryRow(&count)
+//	return
+//}
 
 // 获取数量
 func GetCygxTagHistoryCountUv(tagId int) (count int, err error) {
@@ -84,12 +85,12 @@ 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  `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM (SELECT b.* FROM cygx_tag_history as r 
+	INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id  `
 	if condition != "" {
 		sqlCount += condition
 	}
-	sqlCount += ` WHERE a.company_id=? ) AS t `
+	sqlCount += ` WHERE r.company_id=? ) AS t `
 	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, companyId).QueryRow(&count)
 	return
@@ -99,14 +100,14 @@ func GetCygxTagHistoryCountByCompanyId(companyId int, condition string) (count i
 func GetCygxTagHistoryCountByCompanyIdWeekly(companyId int, condition string) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	databaseName := utils.GetWeeklyDatabase()
-	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
-	INNER JOIN ` + databaseName + `.user_seller_relation AS us ON us.user_id = a.user_id   AND us.product_id = 2 
+	sqlCount := ` SELECT COUNT(1) AS count  FROM (SELECT b.* FROM cygx_tag_history as r 
+	INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id
+	INNER JOIN ` + databaseName + `.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
 `
 	if condition != "" {
 		sqlCount += condition
 	}
-	sqlCount += ` WHERE a.company_id=? ) AS t `
+	sqlCount += ` WHERE r.company_id=? ) AS t `
 
 	err = o.Raw(sqlCount, companyId).QueryRow(&count)
 	return
@@ -114,15 +115,15 @@ func GetCygxTagHistoryCountByCompanyIdWeekly(companyId int, condition string) (c
 
 // 获取数量
 func GetCygxTagHistoryByCompanyId(companyId, startSize, pageSize int, condition string) (list []*UserInteraction, err error) {
-	sqlCount := ` SELECT a.real_name,a.mobile, a.create_time AS create_time,
+	sqlCount := ` SELECT r.real_name,r.mobile, r.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 `
+FROM cygx_tag_history as r 
+	INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id `
 	if condition != "" {
 		sqlCount += condition
 	}
 	sqlCount += ` 
-	WHERE a.company_id=? ORDER BY  create_time DESC LIMIT ?,? `
+	WHERE r.company_id=? ORDER BY  create_time DESC LIMIT ?,? `
 	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, companyId, startSize, pageSize).QueryRows(&list)
 	return
@@ -132,16 +133,16 @@ FROM cygx_tag_history as a
 func GetCygxTagHistoryByCompanyIdWeekly(companyId, startSize, pageSize int, condition string) (list []*UserInteraction, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	databaseName := utils.GetWeeklyDatabase()
-	sqlCount := ` SELECT a.real_name,a.mobile, a.create_time AS create_time,
+	sqlCount := ` SELECT r.real_name,a.mobile, r.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 
-			INNER JOIN ` + databaseName + `.user_seller_relation AS us ON us.user_id = a.user_id   AND us.product_id = 2 `
+			FROM cygx_tag_history as r
+				INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id 
+			INNER JOIN ` + databaseName + `.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 `
 	if condition != "" {
 		sqlCount += condition
 	}
 	sqlCount += ` 
-	WHERE a.company_id=? ORDER BY  create_time DESC LIMIT ?,? `
+	WHERE r.company_id=? ORDER BY  create_time DESC LIMIT ?,? `
 
 	_, err = o.Raw(sqlCount, companyId, startSize, pageSize).QueryRows(&list)
 	return
@@ -198,3 +199,66 @@ func GetCygxTagHistoryCountByCompanyIdCondition(condition string) (count int, er
 	err = o.Raw(sql).QueryRow(&count)
 	return
 }
+
+// 获取列表
+func GetCygxTagHistoryListBycondition(condition string, startSize, pageSize int) (list []*UserInteraction, err error) {
+	sql := ` SELECT r.real_name,r.mobile,ci.tag_num,ui.tag_num AS ui_tag_num,r.company_name, r.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 r 
+				INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id
+				WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += `  ORDER BY  create_time DESC LIMIT ?,? `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&list)
+	return
+}
+
+// 获取列表
+func GetCygxTagHistoryListByconditionWeekly(condition string, startSize, pageSize int) (list []*UserInteraction, err error) {
+	databaseName := utils.GetWeeklyDatabase()
+	sql := ` SELECT r.real_name,r.mobile,r.company_name, r.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 r 
+				INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id
+				INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+				WHERE 1=1 `
+	sql = fmt.Sprintf(sql, databaseName)
+	if condition != "" {
+		sql += condition
+	}
+	sql += `  ORDER BY  create_time DESC LIMIT ?,? `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&list)
+	return
+}
+
+// 获取数量
+func GetCygxTagHistoryCount(condition string) (count int, err error) {
+	sql := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as r 
+			INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id  WHERE 1 = 1 `
+	if condition != "" {
+		sql += condition
+	}
+	o := orm.NewOrmUsingDB("hz_cygx")
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}
+
+// 获取数量
+func GetCygxTagHistoryCountWeekly(condition string) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	databaseName := utils.GetWeeklyDatabase()
+	sql := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as r 
+				INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id
+				INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+		WHERE 1 = 1 `
+	sql = fmt.Sprintf(sql, databaseName)
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}