严选的产业只关联研选下面的标的

controllers/report.go

@@ -2982,10 +2982,26 @@ func (this *ReportController) SearchReportAndResource() {
 			br.ErrMsg = "获取标的信息失败,Err:" + err.Error()
 			return
 		}
+		//严选的产业只关联研选下面的标的
+		var yxcondition string
+		var yxPer []interface{}
+		yxcondition = ` AND ag.article_id >= ?`
+		yxPer = append(yxPer, utils.SummaryArticleId)
+		listYxAticleSubject, err := models.GetSubjectArticleGroupManagementList(yxcondition, yxPer)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取研选报告关联的标的信息失败,GetSubjectArticleGroupManagementListErr:" + err.Error()
+			return
+		}
+		mapYxSubject := make(map[int]int)
+		for _, v := range listYxAticleSubject {
+			mapYxSubject[v.IndustrialSubjectId] = v.IndustrialSubjectId
+		}
+
 		mapIndustrial := make(map[string]int)
 		for _, v := range listSubjcet {
 			for k2, v2 := range listYxResource {
-				if v2.IndustrialManagementId == v.IndustrialManagementId && mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Yx", v.SubjectName)] == 0 {
+				if v2.IndustrialManagementId == v.IndustrialManagementId && mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Yx", v.SubjectName)] == 0 && mapYxSubject[v.IndustrialSubjectId] > 0 {
 					listYxResource[k2].IndustrialSubjectList = append(listYxResource[k2].IndustrialSubjectList, v)
 					mapIndustrial[fmt.Sprint(v2.IndustrialManagementId, "Yx", v.SubjectName)] = v2.IndustrialManagementId
 				}

models/industrial_article_group_subject.go

@@ -0,0 +1,27 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxIndustrialArticleGroupSubject struct {
+	Id                  int       `orm:"column(id);pk" description:"主键ID"`
+	CygxArticleId       int       `description:"cygx_article表的主键ID"`
+	ArticleId           int       `description:"cygx_article表的文章ID"`
+	IndustrialSubjectId int       `description:"cygx_industrial_subject表的文章ID"`
+	CreateTime          time.Time `description:"创建时间"`
+}
+
+//列表
+func GetSubjectArticleGroupManagementList(condition string, pars []interface{}) (items []*CygxIndustrialArticleGroupSubject, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			ag.industrial_subject_id 
+			FROM
+			cygx_industrial_article_group_subject AS ag
+			WHERE
+			 1 =1 ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}