消息研报查询添加一期支持

controllers/message.go

@@ -55,10 +55,12 @@ func (this *MessageController) ReportList() {
 	}
 	var permissionPars []interface{}
 	var classifyPars []interface{}
+	var htPermissions []int
 	if permissionIds != "" {
 		permissionArr := strings.Split(permissionIds, ",")
 		for _, permissionId := range permissionArr {
 			perId, _ := strconv.Atoi(permissionId)
+			htPermissions = append(htPermissions, perId)
 			permissionPars = append(permissionPars, perId)
 		}
 		permissionCondition += " AND chart_permission_id in (" + utils.GetOrmReplaceHolder(len(permissionPars)) + ")"
@@ -77,8 +79,20 @@ func (this *MessageController) ReportList() {
 			br.ErrMsg = "获取报告表ids失败，Err:" + err.Error()
 			return
 		}
-		condition += " AND id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA'"
+		condition += "AND ("
+		// eta
+		condition += " ( id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA')"
 		pars = append(pars, ids)
+		//海通
+		names, err := models.GetPermissionNames(htPermissions)
+		if err != nil {
+			br.Msg = "获取报告列表失败"
+			br.ErrMsg = "获取品种名称失败，Err:" + err.Error()
+			return
+		}
+		condition += " or ( plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT')"
+		condition += ") "
+		pars = append(pars, names)
 	}
 	if analystNames != "" {
 		analystNameArr := strings.Split(analystNames, ",")
@@ -112,29 +126,34 @@ func (this *MessageController) ReportList() {
 		reportViewList = append(reportViewList, reportView)
 	}
 	for _, report := range reportViewList {
-		var classifyId int
-		classifyId, err = models.GetETAReportById(report.OrgId)
-		if err != nil {
-			br.Msg = "获取报告列表失败"
-			br.ErrMsg = "获取eta报告失败，Err:" + err.Error()
-			return
-		}
-		var list []int
-		list, err = models.GetByPermissionIdsByClassifyId(classifyId)
-		if err != nil {
-			br.Msg = "获取报告列表失败"
-			br.ErrMsg = "获取eta品种信息失败，Err:" + err.Error()
-			return
-		}
-		if len(list) > 0 {
-			var names []string
-			names, err = models.GetPermissionNames(list)
+		switch report.Source {
+		case "ETA":
+			var classifyId int
+			classifyId, err = models.GetETAReportById(report.OrgId)
 			if err != nil {
 				br.Msg = "获取报告列表失败"
-				br.ErrMsg = "获取eta品种名称信息失败，Err:" + err.Error()
+				br.ErrMsg = "获取eta报告失败，Err:" + err.Error()
 				return
 			}
-			report.PermissionNames = strings.Join(names, ",")
+			var list []int
+			list, err = models.GetByPermissionIdsByClassifyId(classifyId)
+			if err != nil {
+				br.Msg = "获取报告列表失败"
+				br.ErrMsg = "获取eta品种信息失败，Err:" + err.Error()
+				return
+			}
+			if len(list) > 0 {
+				var names []string
+				names, err = models.GetPermissionNames(list)
+				if err != nil {
+					br.Msg = "获取报告列表失败"
+					br.ErrMsg = "获取eta品种名称信息失败，Err:" + err.Error()
+					return
+				}
+				report.PermissionNames = strings.Join(names, ",")
+			}
+		case "HT":
+			report.PermissionNames = report.PlateName
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)

models/report.go

@@ -16,7 +16,7 @@ const (
 	StatusPending ReportStatus = "PENDING"
 	StatusDone    ReportStatus = "DONE"
 	MaxBatchNum                = 1000
-	CommonColumns              = "id,org_id,author,abstract,title,source,cover_src,published_time"
+	CommonColumns              = "id,org_id,author,abstract,title,source,cover_src,published_time,plate_name"
 	taskColumns                = "id,author,published_time"
 )
 
@@ -28,6 +28,7 @@ type Report struct {
 	Abstract      string       `description:"摘要"`
 	Author        string       `description:"作者"`
 	CoverSrc      int          `description:"封面"`
+	PlateName     string       `description:"板块名称"`
 	Status        ReportStatus `description:"状态"`
 	SendStatus    SendStatus   `description:"发送状态"`
 	PublishedTime string       `description:"发布时间"`
@@ -43,6 +44,7 @@ type ReportView struct {
 	Abstract        string
 	Author          string
 	CoverSrc        string
+	PlateName       string
 	PermissionNames string
 	SendStatus      SendStatus
 	PublishedTime   string
@@ -56,11 +58,11 @@ func (r *Report) ToView() (item *ReportView) {
 		Title:         r.Title,
 		Abstract:      r.Abstract,
 		Author:        r.Author,
+		PlateName:     r.PlateName,
 		SendStatus:    r.SendStatus,
 		PublishedTime: r.PublishedTime,
 	}
 	return
-
 }
 
 func (r *Report) TableName() string {