|
@@ -2180,17 +2180,6 @@ func (this *UserController) CompanyTableList() {
|
|
|
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(conditionArtcile, pars)
|
|
|
if err != nil {
|
|
@@ -3254,6 +3243,7 @@ func (this *UserController) CompanyExportInteraction() {
|
|
|
// @Param EndDate query string false "结束时间"
|
|
|
// @Param KeyWord query string false "搜索关键词"
|
|
|
// @Param ActivityName query string false "活动名称"
|
|
|
+// @Param ClassType query int true "列表类型,1:权益,2:研选,默认1"
|
|
|
// @Success 200 {object} cygx.UserInteractionListResp
|
|
|
// @router /user/company/list [get]
|
|
|
func (this *UserController) CompanyList() {
|
|
@@ -3281,6 +3271,7 @@ func (this *UserController) CompanyList() {
|
|
|
activityName := this.GetString("ActivityName")
|
|
|
source, _ := this.GetInt("Source")
|
|
|
status := this.GetString("Status")
|
|
|
+ classType, _ := this.GetInt("ClassType", 1)
|
|
|
// 套餐类型
|
|
|
//packageType, _ := this.GetInt("PackageType")
|
|
|
keyWord = strings.Trim(keyWord, " ")
|
|
@@ -3548,6 +3539,11 @@ func (this *UserController) CompanyList() {
|
|
|
endDate += " 23:59:59"
|
|
|
condition += ` AND r.create_time <= '` + endDate + `' `
|
|
|
}
|
|
|
+ if classType == 1 {
|
|
|
+ condition += " AND art.article_type_id = 0 "
|
|
|
+ } else {
|
|
|
+ condition += " AND art.article_type_id > 0 "
|
|
|
+ }
|
|
|
var pars []interface{}
|
|
|
condition += " ORDER BY r.create_time DESC "
|
|
|
var listRecord []*cygx.CygxArticleAndYanxuanRecordResp
|
|
@@ -3613,6 +3609,11 @@ func (this *UserController) CompanyList() {
|
|
|
if activityName != "" {
|
|
|
condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
|
|
|
}
|
|
|
+ if classType == 1 {
|
|
|
+ condition += " AND a.chart_permission_id != 31 "
|
|
|
+ } else {
|
|
|
+ condition += " AND a.chart_permission_id = 31 "
|
|
|
+ }
|
|
|
if isAdminRole {
|
|
|
total, err = cygx.GetActivityMeetByCompanyCount(condition)
|
|
|
if err != nil {
|
|
@@ -3667,6 +3668,11 @@ func (this *UserController) CompanyList() {
|
|
|
}
|
|
|
}
|
|
|
} else if source == 3 {
|
|
|
+ if classType == 1 {
|
|
|
+ condition += " AND art.article_type_id = 0 "
|
|
|
+ } else {
|
|
|
+ condition += " AND art.article_type_id > 0 "
|
|
|
+ }
|
|
|
if isAdminRole {
|
|
|
total, err = cygx.GetCygxArticleCollectCountByCompany(condition)
|
|
|
if err != nil {
|
|
@@ -3780,6 +3786,11 @@ func (this *UserController) CompanyList() {
|
|
|
}
|
|
|
|
|
|
} else if source == 5 {
|
|
|
+ if classType == 1 {
|
|
|
+ condition += " AND m.chart_permission_id != 31 "
|
|
|
+ } else {
|
|
|
+ condition += " AND m.chart_permission_id = 31 "
|
|
|
+ }
|
|
|
if isAdminRole {
|
|
|
total, err = cygx.GetCygxIndustryFllowCountByCompany(condition)
|
|
|
if err != nil {
|
|
@@ -3862,6 +3873,11 @@ func (this *UserController) CompanyList() {
|
|
|
}
|
|
|
}
|
|
|
} else if source == 7 {
|
|
|
+ if classType == 1 {
|
|
|
+ condition += " AND r.register_platform IN (1,2) "
|
|
|
+ } else {
|
|
|
+ condition += " AND r.register_platform IN (5,6) "
|
|
|
+ }
|
|
|
if isAdminRole {
|
|
|
total, err = cygx.GetCygxSearchKeyWordCountBuCompany(condition)
|
|
|
if err != nil {
|
|
@@ -3966,14 +3982,6 @@ 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 + `%') `
|
|
|
- //}
|
|
|
if isAdminRole {
|
|
|
total, err = cygx.GetCygxTagHistoryCount(condition)
|
|
|
if err != nil {
|
|
@@ -4001,6 +4009,69 @@ func (this *UserController) CompanyList() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
+ } else if source == 11 { //专栏文章阅读记录
|
|
|
+ if isAdminRole {
|
|
|
+ total, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUser(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ total, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUserWeekly(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(list) > 0 {
|
|
|
+ for k, v := range list {
|
|
|
+ list[k].RegisterPlatform = cygxService.GetArticleSourcePlatform(v.SourcePlatform)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if source == 12 { //收藏的专栏文章
|
|
|
+ if isAdminRole {
|
|
|
+ total, list, err = cygx.GetCygxYanxuanSpecialCollectByUser(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ total, list, err = cygx.GetCygxYanxuanSpecialCollectByUserWeekly(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(list) > 0 {
|
|
|
+ for k, v := range list {
|
|
|
+ list[k].RegisterPlatform = cygxService.GetArticleSourcePlatform(v.SourcePlatform)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if source == 13 { //关注的专栏作者
|
|
|
+ if isAdminRole {
|
|
|
+ total, list, err = cygx.GetCygxYanxuanSpecialAuthorByUser(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ total, list, err = cygx.GetCygxYanxuanSpecialAuthorByUserWeekly(condition, startSize, pageSize)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(list) > 0 {
|
|
|
+ for k, v := range list {
|
|
|
+ list[k].RegisterPlatform = cygxService.GetArticleSourcePlatform(v.SourcePlatform)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
|
|
@@ -4606,6 +4677,7 @@ func (this *UserController) CompanyExportInteractionList() {
|
|
|
|
|
|
// @Title 机构列表互动详情table栏
|
|
|
// @Description 机构列表互动详情table栏接口
|
|
|
+// @Param ClassType query int true "列表类型,1:权益,2:研选,默认1"
|
|
|
// @Success 200 {object} cygx.CygxUserTableListRep
|
|
|
// @router /user/table/companyList [get]
|
|
|
func (this *UserController) TableCompanyList() {
|
|
@@ -4624,6 +4696,7 @@ func (this *UserController) TableCompanyList() {
|
|
|
|
|
|
roleTypeCode := sysUser.RoleTypeCode
|
|
|
status := this.GetString("Status")
|
|
|
+ classType, _ := this.GetInt("ClassType", 1)
|
|
|
//流失
|
|
|
var lossCondition string
|
|
|
var condition string
|
|
@@ -4855,9 +4928,38 @@ func (this *UserController) TableCompanyList() {
|
|
|
}
|
|
|
condition = " AND r.company_id IN (" + strings.Join(companyIds, ",") + ")"
|
|
|
condition += ` AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
|
|
|
+ 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 {
|
|
|
- historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount("", pars)
|
|
|
+ historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
br.ErrMsg = "获取用户阅读记录数量失败,Err:" + err.Error()
|
|
@@ -4865,81 +4967,101 @@ func (this *UserController) TableCompanyList() {
|
|
|
}
|
|
|
|
|
|
//获取参会总数
|
|
|
- activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
|
|
|
+ activityNum, err = cygx.GetActivityMeetByCompanyCount(conditionActivityMeet)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
br.ErrMsg = "获取参会总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
//获取用户收藏记录总数
|
|
|
- articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
|
|
|
+ articleCollect, err = cygx.GetCygxArticleCollectCountByCompany(conditionArtcile)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
br.ErrMsg = "获取用户收藏记录总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
//获取用户关注总数
|
|
|
- industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
|
|
|
+ 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(condition)
|
|
|
+ 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
|
|
|
}
|
|
|
- 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
|
|
|
+ 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},
|
|
|
+ // {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)
|
|
|
+ historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCountWeekly(conditionArtcile, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
br.ErrMsg = "获取用户阅读记录数量失败,Err:" + err.Error()
|
|
@@ -4947,78 +5069,122 @@ func (this *UserController) TableCompanyList() {
|
|
|
}
|
|
|
|
|
|
//获取参会总数
|
|
|
- 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(conditionIndustryFllow)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败 "
|
|
|
br.ErrMsg = "获取用户关注总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
//获取关注作者总数
|
|
|
- departmentFollowNum, err := cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
|
|
|
+ departmentFollowNum, err = cygx.GetCygArticleDepartmentFollowCountByCompanyWeekly(condition)
|
|
|
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
|
|
|
+ }
|
|
|
+ //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
|
|
|
+ }
|
|
|
+
|
|
|
+ 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
|
|
|
}
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|