no message

controllers/cygx/rai_serve.go

@@ -350,13 +350,13 @@ func (this *RaiServeCoAntroller) BillList() {
 	total, err := cygx.GetCygxRaiServeBillCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，GetCygxRaiServeCompanyCountErr:" + err.Error()
+		br.ErrMsg = "获取失败，GetCygxRaiServeBillCount:" + err.Error()
 		return
 	}
 	list, err := cygx.GetCygxRaiServeBillRespList(condition, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，GetCygxRaiServeCompanyCountErr:" + err.Error()
+		br.ErrMsg = "获取失败，GetCygxRaiServeBillRespList:" + err.Error()
 		return
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)

controllers/cygx/user.go

@@ -2272,6 +2272,7 @@ func (this *UserController) CompanyTableList() {
 	var yanxuanSpecialNum int        //专栏文章阅读记录
 	var yanxuanSpecialCollectNum int //收藏的专栏文章
 	var yanxuanSpecialFollowNum int  //关注的专栏作者
+	var feedbackNum int              //交流反馈数量
 
 	if isAdminRole {
 		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
@@ -2363,6 +2364,13 @@ func (this *UserController) CompanyTableList() {
 			return
 		}
 
+		feedbackNum, err = cygx.GetCygxUserFeedbackCountByUserModel(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取交流反馈数量失败"
+			return
+		}
+
 	} else {
 		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCountWeekly(conditionArtcile, pars)
 		if err != nil {
@@ -2452,6 +2460,14 @@ func (this *UserController) CompanyTableList() {
 			br.Msg = "获取关注的专栏作者数量失败"
 			return
 		}
+
+		feedbackNum, err = cygx.GetCygxUserFeedbackCountByUserModelWeekly(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取交流反馈数量失败"
+			return
+		}
+
 	}
 
 	if classType == 1 {
@@ -2463,7 +2479,8 @@ func (this *UserController) CompanyTableList() {
 			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
 			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
 			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
-			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum},
+			{PermissionName: "交流反馈", Source: 14, TotalNum: feedbackNum}}
 		resp.List = List
 	} else {
 		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},
@@ -3064,6 +3081,22 @@ func (this *UserController) CompanyTableDetail() {
 				list[k].HttpUrl = utils.CYGX_MFYX_URL + "/column/view/" + strconv.Itoa(v.DepartmentId)
 			}
 		}
+	} else if source == 14 { //交流反馈
+		if isAdminRole {
+			total, list, err = cygx.GetCygxUserFeedback(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户交流反馈，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, list, err = cygx.GetCygxUserFeedbackWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户交流反馈，Err:" + err.Error()
+				return
+			}
+		}
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
@@ -4346,6 +4379,22 @@ func (this *UserController) CompanyList() {
 				list[k].HttpUrl = utils.CYGX_MFYX_URL + "/column/view/" + strconv.Itoa(v.DepartmentId)
 			}
 		}
+	} else if source == 14 { //交流反馈
+		if isAdminRole {
+			total, list, err = cygx.GetCygxUserFeedback(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		} else {
+			total, list, err = cygx.GetCygxUserFeedbackWeekly(condition, startSize, pageSize)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
@@ -5297,6 +5346,7 @@ func (this *UserController) TableCompanyList() {
 	var yanxuanSpecialNum int        //专栏文章阅读记录
 	var yanxuanSpecialCollectNum int //收藏的专栏文章
 	var yanxuanSpecialFollowNum int  //关注的专栏作者
+	var feedbackNum int              //交流反馈数量
 
 	if isAdminRole {
 		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
@@ -5389,17 +5439,13 @@ func (this *UserController) TableCompanyList() {
 			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
+		feedbackNum, err = cygx.GetCygxUserFeedbackCountByUserModel(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取交流反馈数量失败"
+			return
+		}
+
 	} else {
 		historyNum, err = cygx.GetCygxArticleAndYanxuanRecordCountWeekly(conditionArtcile, pars)
 		if err != nil {
@@ -5491,17 +5537,13 @@ func (this *UserController) TableCompanyList() {
 			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
+		feedbackNum, err = cygx.GetCygxUserFeedbackCountByUserModelWeekly(condition, pars)
+		if err != nil {
+			br.ErrMsg = "获取信息失败，Err:" + err.Error()
+			br.Msg = "获取交流反馈数量失败"
+			return
+		}
+
 	}
 
 	if classType == 1 {
@@ -5513,7 +5555,8 @@ func (this *UserController) TableCompanyList() {
 			{PermissionName: "关注的产业", Source: 5, TotalNum: industryFllowNum},
 			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum},
 			{PermissionName: "音视频播放", Source: 9, TotalNum: roadshowTotal},
-			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum}}
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: tagNum},
+			{PermissionName: "交流反馈", Source: 14, TotalNum: feedbackNum}}
 		resp.List = List
 	} else {
 		List := []*cygx.CygxUserTableRep{{PermissionName: "报告阅读列表", Source: 1, TotalNum: historyNum},

models/cygx/user_feedback.go

@@ -1,7 +1,9 @@
 package cygx
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )
@@ -85,14 +87,14 @@ func GetCygxUserFeedbackCount(condition string, pars []interface{}) (count int,
 	return
 }
 
-// 用户阅读记录列表
+// 用户交流反馈
 func GetCygxUserFeedback(condition string, startSize, pageSize int) (total int, items []*UserInteraction, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	var sql string
-	sql += ` 	SELECT
-			r.content as  title,
+	sql += `SELECT
+			r.content as title,
 			r.user_id,
-		    r.mobile ,
+		    r.mobile,
 			r.real_name,
 			r.company_id,
 			r.company_name,
@@ -107,10 +109,68 @@ func GetCygxUserFeedback(condition string, startSize, pageSize int) (total int,
 		return
 	}
 
-	sql += ` ORDER BY create_time DESC, department_id DESC   `
+	sql += ` ORDER BY create_time DESC `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+// 用户交流反馈
+func GetCygxUserFeedbackWeekly(condition string, startSize, pageSize int) (total int, items []*UserInteraction, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	var sql string
+	sql += `SELECT
+			r.content as title,
+			r.user_id,
+		    r.mobile,
+			r.real_name,
+			r.company_id,
+			r.company_name,
+			r.create_time
+		FROM
+			cygx_user_feedback 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 ` + condition
+	databaseName := utils.GetWeeklyDatabase()
+	sql = fmt.Sprintf(sql, databaseName)
+	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	err = o.Raw(totalSql).QueryRow(&total)
+	if err != nil {
+		return
+	}
+	sql += ` ORDER BY create_time DESC `
+	if startSize > 0 || pageSize > 0 {
+		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
+	}
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// 获取数量
+func GetCygxUserFeedbackCountByUserModel(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_user_feedback as r
+                  WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 获取数量
+func GetCygxUserFeedbackCountByUserModelWeekly(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM 	cygx_user_feedback 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  `
+	databaseName := utils.GetWeeklyDatabase()
+	sqlCount = fmt.Sprintf(sqlCount, databaseName)
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}