no message

controllers/cygx/user.go

@@ -2060,92 +2060,126 @@ func (this *UserController) CompanyTableList() {
 	//	br.ErrMsg = "获取Es文章阅读数量失败，Err:" + err.Error()
 	//	return
 	//}
+	conditionArtcile := condition       //文章搜索条件
+	conditionActivityMeet := condition  //活动到会搜索条件
+	conditionIndustryFllow := condition //产业关注搜索条件
+	conditionKeyWord := condition       //关键词记录搜索条件
+	if classType == 1 {
+		conditionArtcile += " AND art.article_type_id > 0  "
+		conditionActivityMeet += " AND a.chart_permission_id  != 31  "
+		conditionIndustryFllow += " AND m.chart_permission_id  != 31  "
+		conditionKeyWord += " AND r.register_platform IN (1,2)  "
+	} else {
+		conditionArtcile += " AND art.article_type_id = 0  "
+		conditionActivityMeet += " AND a.chart_permission_id  = 31  "
+		conditionIndustryFllow += " AND m.chart_permission_id  = 31  "
+		conditionKeyWord += " AND r.register_platform IN (5,6)  "
+	}
+
+	var historyNum int               //报告阅读列表
+	var activityNum int              //活动互动记录
+	var triptotal int                //专项调研
+	var articleCollect int           //收藏的报告
+	var chartNum int                 //收藏图表
+	var industryFllowNum int         //关注的产业
+	var departmentFollowNum int      //关注的作者
+	var keyWordNum int               //搜索
+	var roadshowTotal int            //音视频播放
+	var tagNum int                   //首页标签点击
+	var yanxuanSpecialNum int        //专栏文章阅读记录
+	var yanxuanSpecialCollectNum int //收藏的专栏文章
+	var yanxuanSpecialFollowNum int  //关注的专栏作者
 
 	if isAdminRole {
-		conditionArtcile := condition       //文章搜索条件
-		conditionActivityMeet := condition  //活动到会搜索条件
-		conditionIndustryFllow := condition //产业关注搜索条件
-		conditionKeyWord := condition       //关键词记录搜索条件
-		if classType == 1 {
-			conditionArtcile += " AND art.article_type_id > 0  "
-			conditionActivityMeet += " AND a.chart_permission_id  != 31  "
-			conditionIndustryFllow += " AND m.chart_permission_id  != 31  "
-			conditionKeyWord += " AND r.register_platform IN (1,2)  "
-		} else {
-			conditionArtcile += " AND art.article_type_id = 0  "
-			conditionActivityMeet += " AND a.chart_permission_id  = 31  "
-			conditionIndustryFllow += " AND m.chart_permission_id  = 31  "
-			conditionKeyWord += " AND r.register_platform IN (5,6)  "
-		}
-
-		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
+		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
 			return
 		}
 
-		activityNum, err := cygx.GetActivityMeetByCompanyCount(conditionActivityMeet)
+		activityNum, err = cygx.GetActivityMeetByCompanyCount(conditionActivityMeet)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户收藏记录总数
-		articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(conditionArtcile)
+		articleCollect, err = cygx.GetCygxArticleCollectCountByCompany(conditionArtcile)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户关注总数
-		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(conditionIndustryFllow)
+		industryFllowNum, err = cygx.GetCygxIndustryFllowCountByCompany(conditionIndustryFllow)
 		if err != nil {
 			br.Msg = "获取信息失败 "
 			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
 			return
 		}
 		//获取关注作者总数
-		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
+		departmentFollowNum, err = cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
 			return
 		}
 		//获取搜索记录
-		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(conditionKeyWord)
+		keyWordNum, err = cygx.GetCygxSearchKeyWordCountBuCompany(conditionKeyWord)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
 
-		chartNum, err := cygx.GetChartCountByUserMobile(condition)
+		chartNum, err = cygx.GetChartCountByUserMobile(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取总数失败，Err:" + err.Error()
 			return
 		}
 
-		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompany(condition)
+		triptotal, err = cygx.GetCygxActivitySpecialTripCountByCompany(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
 
-		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompany(condition)
+		roadshowTotal, err = cygx.GetCygxRoadshowCountByCompany(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
-		tagNum, err := cygx.GetCygxTagHistoryCount(condition)
+		tagNum, err = cygx.GetCygxTagHistoryCount(condition)
 		if err != nil {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
 			br.Msg = "获取搜索记录失败"
 			return
 		}
+		yanxuanSpecialNum, err = cygx.GetCygxYanxuanSpecialRecordCount(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取研选专栏阅读数量失败"
+			return
+		}
+
+		yanxuanSpecialCollectNum, err = cygx.GetCygxYanxuanSpecialCollectCount(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取收藏的专栏文章数量失败"
+			return
+		}
+
+		yanxuanSpecialFollowNum, err = cygx.GetCygxYanxuanSpecialFollowCount(condition, pars)
+		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},
@@ -2158,84 +2192,117 @@ func (this *UserController) CompanyTableList() {
 			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
 		resp.List = List
 	} else {
-		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCountWeekly(condition, pars)
+		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCountWeekly(conditionArtcile, pars)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
 			return
 		}
-		activityNum, err := cygx.GetActivityMeetByCompanyCountWeekly(condition)
+		activityNum, err = cygx.GetActivityMeetByCompanyCountWeekly(conditionActivityMeet)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户收藏记录总数
-		articleCollect, err := cygx.GetCygxArticleCollectCountByCompanyWeekly(condition)
+		articleCollect, err = cygx.GetCygxArticleCollectCountByCompanyWeekly(conditionArtcile)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户关注总数
-		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompanyWeekly(condition)
+		industryFllowNum, err = cygx.GetCygxIndustryFllowCountByCompanyWeekly(condition)
 		if err != nil {
 			br.Msg = "获取信息失败 "
 			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
 			return
 		}
 		//获取关注作者总数
-		departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
+		departmentFollowNum, err = cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(conditionIndustryFllow)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取关注作者总数失败，Err:" + err.Error()
 			return
 		}
 		//获取搜索记录
-		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompanyWeekly(condition)
+		keyWordNum, err = cygx.GetCygxSearchKeyWordCountBuCompanyWeekly(conditionKeyWord)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
 
-		chartNum, err := cygx.GetChartCountByUserMobileWeekly(condition)
+		chartNum, err = cygx.GetChartCountByUserMobileWeekly(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取总数失败，Err:" + err.Error()
 			return
 		}
 
-		triptotal, err := cygx.GetCygxActivitySpecialTripCountByCompanyWeekly(condition)
+		triptotal, err = cygx.GetCygxActivitySpecialTripCountByCompanyWeekly(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
 
-		roadshowTotal, err := cygx.GetCygxRoadshowCountByCompanyWeekly(condition)
+		roadshowTotal, err = cygx.GetCygxRoadshowCountByCompanyWeekly(condition)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 			return
 		}
-		tagNum, err := cygx.GetCygxTagHistoryCountWeekly(condition)
+		tagNum, err = cygx.GetCygxTagHistoryCountWeekly(condition)
 		if err != nil {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
 			br.Msg = "获取搜索记录失败"
 			return
 		}
+
+		yanxuanSpecialNum, err = cygx.GetCygxYanxuanSpecialRecordCountWeekly(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取研选专栏阅读数量失败"
+			return
+		}
+
+		yanxuanSpecialCollectNum, err = cygx.GetCygxYanxuanSpecialCollectCountWeekly(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取收藏的专栏文章数量失败"
+			return
+		}
+
+		yanxuanSpecialFollowNum, err = cygx.GetCygxYanxuanSpecialFollowCountWeekly(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取关注的专栏作者数量失败"
+			return
+		}
+	}
+
+	if classType == 1 {
 		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 {
+		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
+			{PermissionName: "活动互动记录", Source: 2, TotalNum: activityNum},
+			{PermissionName: "收藏的报告", Source: 3, TotalNum: articleCollect},
+			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
+			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
+			{PermissionName: "专栏文章阅读记录", Source: 11, TotalNum: yanxuanSpecialNum},
+			{PermissionName: "收藏的专栏文章", Source: 12, TotalNum: yanxuanSpecialCollectNum},
+			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: yanxuanSpecialFollowNum}}
+		resp.List = List
 	}
 
 	resp.ComapnyName = comanyDetail.CompanyName

models/cygx/article_and_yanxuan_record.go

@@ -79,3 +79,90 @@ func GetCygxArticleAndYanxuanRecordRespListWeekly(condition string, pars []inter
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// 获取研选专栏阅读数量
+func GetCygxYanxuanSpecialRecordCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_record AS r
+			INNER JOIN cygx_yanxuan_special AS art ON art.id = r.yanxuan_special_id
+		WHERE 1 = 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 获取研选专栏阅读数量
+func GetCygxYanxuanSpecialRecordCountWeekly(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_record AS r
+			INNER JOIN cygx_yanxuan_special AS art ON art.id = r.yanxuan_special_id
+			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+		WHERE 1 = 1  `
+	databaseName := utils.GetWeeklyDatabase()
+	sqlCount = fmt.Sprintf(sqlCount, databaseName)
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 收藏的专栏文章
+func GetCygxYanxuanSpecialCollectCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_collect AS r
+			INNER JOIN cygx_yanxuan_special AS art ON art.id = r.yanxuan_special_id
+		WHERE 1 = 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 收藏的专栏文章
+func GetCygxYanxuanSpecialCollectCountWeekly(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_collect AS r
+			INNER JOIN cygx_yanxuan_special AS art ON art.id = r.yanxuan_special_id
+			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+		WHERE 1 = 1  `
+	databaseName := utils.GetWeeklyDatabase()
+	sqlCount = fmt.Sprintf(sqlCount, databaseName)
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 关注的专栏作者
+func GetCygxYanxuanSpecialFollowCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_follow AS r
+			INNER JOIN cygx_yanxuan_special_author AS art ON art.user_id = r.follow_user_id
+		WHERE 1 = 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 关注的专栏作者
+func GetCygxYanxuanSpecialFollowCountWeekly(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_yanxuan_special_follow AS r
+			INNER JOIN cygx_yanxuan_special_author AS art ON art.user_id = r.follow_user_id
+			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
+		WHERE 1 = 1  `
+	databaseName := utils.GetWeeklyDatabase()
+	sqlCount = fmt.Sprintf(sqlCount, databaseName)
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}