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

controllers/message.go

@@ -73,16 +73,13 @@ func (this *MessageController) ReportList() {
 		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
+		// eta
 		ids, _ = models.GetETAReportIdsByCondition(classifyCondition, classifyPars)
 		if err != nil {
 			br.Msg = "获取报告列表失败"
 			br.ErrMsg = "获取报告表ids失败，Err:" + err.Error()
 			return
 		}
-		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 {
@@ -90,9 +87,19 @@ func (this *MessageController) ReportList() {
 			br.ErrMsg = "获取品种名称失败，Err:" + err.Error()
 			return
 		}
-		condition += " or ( plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT')"
-		condition += ") "
-		pars = append(pars, names)
+		if len(ids) == 0 && len(names) == 0 {
+			condition += ""
+		} else if len(ids) == 0 {
+			condition += "And (plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT')"
+			pars = append(pars, names)
+		} else if len(names) == 0 {
+			condition += "AND  ( id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA') "
+			pars = append(pars, ids)
+		} else {
+			condition += "AND ( (id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA') or (plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT'))"
+			pars = append(pars, ids)
+			pars = append(pars, names)
+		}
 	}
 	if analystNames != "" {
 		analystNameArr := strings.Split(analystNames, ",")