Browse Source

no message

xingzai 2 years ago
parent
commit
095d10afbe
4 changed files with 12 additions and 6 deletions
  1. 5 1
      controllers/chart_permission.go
  2. 2 2
      controllers/report.go
  3. 3 3
      models/report_mapping.go
  4. 2 0
      utils/constants.go

+ 5 - 1
controllers/chart_permission.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 )
 
-//品种
+// 品种
 type ChartPermissionController struct {
 	BaseCommonController
 }
@@ -67,6 +67,10 @@ func (this *ChartPermissionController) ListByReport() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+	item := new(models.ChartPermissionResp)
+	item.PermissionName = utils.GU_SHOU_NAME
+	item.ChartPermissionId = utils.GU_SHOU_ID
+	list = append(list, item)
 	resp := new(models.ChartPermissionListResp)
 	resp.List = list
 	br.Ret = 200

+ 2 - 2
controllers/report.go

@@ -51,8 +51,8 @@ func (this *MobileReportController) TradeList() {
 	var list []*models.TradeReportMapping
 	var err error
 	mapCategory := make(map[int]int)
-	if ChartPermissionId == utils.CE_LUE_ID {
-		listTrade, errTrade := models.GetReportMappingStrategyHomeAll(user.UserId)
+	if ChartPermissionId == utils.CE_LUE_ID || ChartPermissionId == utils.GU_SHOU_ID {
+		listTrade, errTrade := models.GetReportMappingStrategyHomeAll(user.UserId, ChartPermissionId)
 		list = listTrade
 		err = errTrade
 

+ 3 - 3
models/report_mapping.go

@@ -58,7 +58,7 @@ func GetReportMappingStrategyAll() (items []*ReportMapping, err error) {
 }
 
 // 获取策略下面的所有分类
-func GetReportMappingStrategyHomeAll(userId int) (items []*TradeReportMapping, err error) {
+func GetReportMappingStrategyHomeAll(userId, ChartPermissionId int) (items []*TradeReportMapping, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			MAX( art.publish_date ) AS update_time,
@@ -69,12 +69,12 @@ func GetReportMappingStrategyHomeAll(userId int) (items []*TradeReportMapping, e
 				INNER JOIN cygx_article AS art ON art.category_id = re.category_id 
 			WHERE
 				re.report_type = 1 
-				AND re.chart_permission_id = 23 
+				AND re.chart_permission_id = ? 
 			GROUP  BY
 				re.match_type_name
 			ORDER BY
 				sort DESC , art.publish_date DESC`
-	_, err = o.Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql, ChartPermissionId).QueryRows(&items)
 	return
 }
 

+ 2 - 0
utils/constants.go

@@ -93,6 +93,8 @@ const (
 	YAN_XUAN_ARTICLE_TYPE_IDS        string = "1,2,12" // 属于研选的报告类型ID
 	REOURCE_YX                       string = "Yx"
 	REOURCE_HZ                       string = "Hz"
+	GU_SHOU_NAME                     string = "固收"
+	GU_SHOU_ID                       int    = 100000 // 自定义权限类型ID ,十万起步
 )
 
 // 模板消息推送类型