|
@@ -44,12 +44,33 @@ func (this *MessageController) ReportList() {
|
|
|
if currentIndex <= 0 {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
+ var permissionPars []interface{}
|
|
|
+ var classifyPars []interface{}
|
|
|
if permissionIds != "" {
|
|
|
permissionArr := strings.Split(permissionIds, ",")
|
|
|
- permissionCondition += "permission_id in (" + utils.GetOrmReplaceHolder(len(permissionArr)) + ")"
|
|
|
- pars = append(pars, permissionArr)
|
|
|
+ for _, permissionId := range permissionArr {
|
|
|
+ perId, _ := strconv.Atoi(permissionId)
|
|
|
+ permissionPars = append(permissionPars, perId)
|
|
|
+ }
|
|
|
+ permissionCondition += " AND chart_permission_id in (" + utils.GetOrmReplaceHolder(len(permissionPars)) + ")"
|
|
|
+ classifyIds, err := models.GetClassifyIdsByPermissionIds(permissionCondition, permissionPars)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取报告列表失败"
|
|
|
+ br.ErrMsg = "eta获取品种信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ classifyCondition := " AND COALESCE(NULLIF(classify_id_third,0),NULLIF(classify_id_second,0),classify_id_first) in (" + utils.GetOrmReplaceHolder(len(classifyIds)) + ")"
|
|
|
+ classifyPars = append(classifyPars, classifyIds)
|
|
|
+ var ids []int
|
|
|
+ ids, _ = models.GetETAReportIdsByCondition(classifyCondition, classifyPars)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取报告列表失败"
|
|
|
+ br.ErrMsg = "获取报告表ids失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ condition += " AND id in (" + utils.GetOrmReplaceHolder(len(ids)) + ") And source ='ETA'"
|
|
|
+ pars = append(pars, ids)
|
|
|
}
|
|
|
-
|
|
|
if analystNames != "" {
|
|
|
analystNameArr := strings.Split(analystNames, ",")
|
|
|
condition += " AND author in (" + utils.GetOrmReplaceHolder(len(analystNameArr)) + ")"
|
|
@@ -63,16 +84,16 @@ func (this *MessageController) ReportList() {
|
|
|
sortCondition = sortCondition + sortType
|
|
|
total, err := models.GetReportCountByCondition(condition, pars)
|
|
|
if err != nil {
|
|
|
- br.Msg = "获取音频列表失败"
|
|
|
- br.ErrMsg = "获取音频列表统计失败,Err:" + err.Error()
|
|
|
+ br.Msg = "获取报告列表失败"
|
|
|
+ br.ErrMsg = "获取报告列表统计失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
startSize := utils.StartIndex(currentIndex, pageSize)
|
|
|
reportList, err := models.GetReportByCondition(condition, sortCondition, pars, startSize, pageSize)
|
|
|
if err != nil {
|
|
|
- br.Msg = "获取研报列表失败"
|
|
|
- br.ErrMsg = "获取研报列表失败,Err:" + err.Error()
|
|
|
+ br.Msg = "获取报告列表失败"
|
|
|
+ br.ErrMsg = "获取报告列表失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
var reportViewList []*models.ReportView
|