Merge branch 'feature/yb11.10_rai_report' into debug

models/roadshow/calendar_researcher_question.go

@@ -8,6 +8,7 @@ import (
 
 type RsCalendarResearcherQuestion struct {
 	RsCalendarResearcherQuestionId int       `orm:"column(rs_calendar_researcher_question_id);pk"`
+	RsCalendarId                   int       `description:"路演日历id"`
 	RsCalendarResearcherId         int       `description:"路演研究员记录ID"`
 	QuestionContent                string    `description:"提问内容"`
 	ReplyContent                   string    `description:"回复内容"`
@@ -49,6 +50,7 @@ func RoadShowQuestionSave(req *RoadShowQuestionSaveReq) (err error) {
 	list := make([]*RsCalendarResearcherQuestion, 0)
 	for _, v := range req.QuestionList {
 		item := new(RsCalendarResearcherQuestion)
+		item.RsCalendarId = req.RsCalendarId
 		item.RsCalendarResearcherId = req.RsCalendarResearcherId
 		item.QuestionContent = v.QuestionContent
 		item.ReplyContent = v.ReplyContent

models/tables/chart_permission/chart_permission.go

@@ -66,7 +66,7 @@ func GetYbChartPermissionFirst() (list []*YbChartPermissionFirst, err error) {
 // GetFiccPermissionExceptTactic 获取除了市场策略外的ficc权限
 func GetFiccPermissionExceptTactic() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略' ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略' and classify_name != '固定收益' ORDER BY sort ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -74,7 +74,7 @@ func GetFiccPermissionExceptTactic() (items []*ChartPermission, err error) {
 // GetPermissionFirstByProductId 获取一级品种权限
 func GetPermissionFirstByProductId(productId int) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND parent_id = 0 AND permission_type = 0 and classify_name != '市场策略' ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND parent_id = 0 AND permission_type = 0 and classify_name != '市场策略' and classify_name != '固定收益' ORDER BY sort ASC`
 	_, err = o.Raw(sql, productId).QueryRows(&items)
 	return
 }
@@ -82,7 +82,7 @@ func GetPermissionFirstByProductId(productId int) (items []*ChartPermission, err
 // GetPermissionSecondByProductId 获取二级品种权限
 func GetPermissionSecondByProductId(productId int) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND parent_id > 0 AND permission_type = 0 and classify_name != '市场策略' ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND parent_id > 0 AND permission_type = 0 and classify_name != '市场策略' and classify_name != '固定收益' ORDER BY sort ASC`
 	_, err = o.Raw(sql, productId).QueryRows(&items)
 	return
 }

services/contract/contract.go

@@ -429,7 +429,7 @@ func GetServicePermissionMap(serviceList []*contractCustom.ContractServiceAndDet
 			}
 			for _, v := range allFiccPermissions {
 				if v.ParentId == 0 {
-					if v.PermissionName == "市场策略" {
+					if v.PermissionName == "市场策略" || v.PermissionName == "固定收益" {
 						continue
 					}
 					items, ok := permissionMap[v.ChartPermissionId]