Merge branch 'master' into cygx_12.0

controllers/activity.go

@@ -1286,6 +1286,7 @@ func (this *ActivityController) SignupCancel() {
 		br.ErrMsg = "操作失败,Err:" + errSignup.Error()
 		return
 	}
+
 	go services.YanXuanActivityPointsBillSignupCancel(activityId, uid) // 用户取消报名添加到处理研选扣点
 	// 如果是买方研选下的专家沙龙，同时推给内容组四人
 	if activityInfo.ActivityTypeId == 5 {

controllers/report_selection.go

@@ -55,6 +55,21 @@ func (this *ReportSelectionController) Detail() {
 		br.ErrMsg = "报告ID错误" + strconv.Itoa(articleId)
 		return
 	}
+
+	PermissionNameMap, err := services.GetPermissionNameMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap，Err:" + err.Error()
+		return
+	}
+
+	PermissionIcoMap, err := services.GetPermissionNameIcoMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap，Err:" + err.Error()
+		return
+	}
+
 	resp := new(models.ReportSelectionLetailResp)
 	//判断用户权限
 	hasPermission, err := services.GetUserhasPermission(user)
@@ -150,6 +165,8 @@ func (this *ReportSelectionController) Detail() {
 			}
 			item.BodyChartSummary = mapChartLog[v.PermissionName]
 			item.List = listSonLog
+			item.PermissionName = PermissionNameMap[v.ChartPermissionId]
+			item.IcoLink = PermissionIcoMap[v.ChartPermissionId]
 			items = append(items, item)
 			itemsSubject = append(itemsSubject, itemSubject)
 			//itemLogs = make([]*models.CygxReportSelectionLogDetail, 0)

models/activity_special_trip_bill.go

@@ -70,13 +70,11 @@ type CygxActivitySpecialTripBillList struct {
 func GetCygxActivitySpecialTripBillList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			b.*,
-			c.chart_permission_name 
+			b.*
 		FROM
 			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
 		WHERE
 			1 = 1` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
-}
+}

models/chart_permission.go

@@ -14,6 +14,7 @@ type ChartPermission struct {
 	ChartPermissionId int    `description:"权限id"`
 	PermissionName    string `description:"权限名称"`
 	IsShowSustainable bool   `description:"是否展示限免标签"`
+	ImageUrlM         string `description:"图片地址"`
 }
 
 type CompanyReportPermission struct {
@@ -71,3 +72,10 @@ func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err e
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	return
 }
+
+func GetChartPermissionListRai() (items []*ChartPermission, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := `SELECT * FROM chart_permission WHERE product_id=2  ORDER BY sort ASC `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/company.go

@@ -34,6 +34,7 @@ func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
 }
 
 func GetCompanyDetailByIdGroup(companyId int) (item *CompanyDetail, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile ,b.is_suspend
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
@@ -43,7 +44,6 @@ func GetCompanyDetailByIdGroup(companyId int) (item *CompanyDetail, err error) {
 			WHERE a.company_id=? AND b.product_id = 2 
 			OR (a.company_id = ? AND  cp.permission_name = '策略' ) 
 			ORDER BY b.product_id DESC  LIMIT 0,1 `
-	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }

models/minutesSummary.go

@@ -107,10 +107,9 @@ func GetMinutesSummarylogSonListAll(articleId, chartPermissionId int) (items []*
 // 列表
 func GetMinutesSummarylogSonListSecond(articleId int, artType string) (items []*CygxResearchSummaryLogSecond, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.chart_permission_id ,c.image_url_m as image_url, l.* 
+	sql := `SELECT  l.* 
 			FROM
 			cygx_minutes_summary_log AS l
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? AND l.type =?
 			GROUP BY l.chart_permission_id
 			ORDER  BY l.chart_permission_sort ASC`

models/report_selection.go

@@ -147,7 +147,7 @@ func GetReportSelectionListHome(condition, tbdb string, pars []interface{}, star
 // 列表
 func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLog, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,s.subject_name , l.*  ,l.company_label as label
+	sql := `SELECT s.subject_name , l.*  ,l.company_label as label
 			FROM
 			cygx_report_selection_log AS l
 			INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 

services/company_permission.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-//GetCompanyPermission 获取公司对应的权限名称
+// GetCompanyPermission 获取公司对应的权限名称
 func GetCompanyPermission(companyId int) (permissionStr string, err error) {
 	permissionStr, err = models.GetCompanyPermission(companyId)
 	if err != nil {
@@ -18,7 +18,7 @@ func GetCompanyPermission(companyId int) (permissionStr string, err error) {
 	return
 }
 
-//GetCompanyPermissionUpgrade 获取公司对应的升级权限名称
+// GetCompanyPermissionUpgrade 获取公司对应的升级权限名称
 func GetCompanyPermissionUpgrade(companyId int) (permissionStr string, err error) {
 	permissionStr, err = models.GetCompanyPermissionByUserTrip(companyId)
 	if err != nil {
@@ -29,7 +29,7 @@ func GetCompanyPermissionUpgrade(companyId int) (permissionStr string, err error
 	return
 }
 
-//获取用户对应的权限申请状态
+// 获取用户对应的权限申请状态
 func GetUserHasPermission(user *models.WxUserItem) (hasPermission int, sellerName, sellerMobile, popupMsg string, err error) {
 	//HasPermission int `description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下（ficc），3:无该品类权限,已提交过申请，4：无该品类权限,未提交过申请，5：潜在客户，未提交过申请，6：潜在客户,已提交过申请"`
 	uid := user.UserId
@@ -76,7 +76,7 @@ func GetUserHasPermission(user *models.WxUserItem) (hasPermission int, sellerNam
 	return
 }
 
-//获取用户对应的权限申请状态 文章详情
+// 获取用户对应的权限申请状态 文章详情
 func GetUserHasPermissionArticle(user *models.WxUserItem) (hasPermission int, sellerName, sellerMobile, popupMsg string, err error) {
 	//`description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下，3:无该品类权限，4：潜在客户，未提交过申请，5：潜在客户,已提交过申请"`
 	uid := user.UserId
@@ -121,7 +121,7 @@ func GetUserHasPermissionArticle(user *models.WxUserItem) (hasPermission int, se
 	return
 }
 
-//获取用户对应的权限简单版
+// 获取用户对应的权限简单版
 func GetUserHasPermissionSimple(user *models.WxUserItem) (hasPermission int, err error) {
 	//HasPermission int `description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下（ficc），3:无该品类权限,已提交过申请，4：无该品类权限,未提交过申请，5：潜在客户，未提交过申请，6：潜在客户,已提交过申请"`
 	uid := user.UserId
@@ -149,4 +149,33 @@ func GetUserHasPermissionSimple(user *models.WxUserItem) (hasPermission int, err
 		}
 	}
 	return
-}
+}
+
+// GetPermissionNameMap 权限名称与权限ID的map
+func GetPermissionNameMap() (mapItem map[int]string, err error) {
+	list, e := models.GetChartPermissionListRai()
+	if e != nil {
+		err = e
+		return
+	}
+	mapPermissionName := make(map[int]string)
+	for _, v := range list {
+		mapPermissionName[v.ChartPermissionId] = v.PermissionName
+	}
+	mapItem = mapPermissionName
+	return
+}
+
+func GetPermissionNameIcoMap() (mapItem map[int]string, err error) {
+	list, e := models.GetChartPermissionListRai()
+	if e != nil {
+		err = e
+		return
+	}
+	mapPermissionName := make(map[int]string)
+	for _, v := range list {
+		mapPermissionName[v.ChartPermissionId] = v.ImageUrlM
+	}
+	mapItem = mapPermissionName
+	return
+}