|
@@ -2727,6 +2727,54 @@ func (this *ReportController) SearchReportAndResource() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ var articleIds string
|
|
|
+ for _, v := range ListHzReport {
|
|
|
+ articleIds += strconv.Itoa(v.ArticleId) + ","
|
|
|
+ }
|
|
|
+ for _, v := range ListYxReport {
|
|
|
+ articleIds += strconv.Itoa(v.ArticleId) + ","
|
|
|
+ }
|
|
|
+ articleIds = strings.TrimRight(articleIds, ",")
|
|
|
+ silcearticleIds := strings.Split(articleIds, ",")
|
|
|
+ var parsindustrial []interface{}
|
|
|
+ parsindustrial = make([]interface{}, 0)
|
|
|
+ articleIdList := make([]string, 0)
|
|
|
+ for _, v := range silcearticleIds {
|
|
|
+ articleIdList = append(articleIdList, v)
|
|
|
+ }
|
|
|
+ conditionindustrial := ` AND mg.article_id IN ( ` + utils.GetOrmInReplace(len(silcearticleIds)) + ` ) `
|
|
|
+ parsindustrial = append(parsindustrial, articleIdList)
|
|
|
+ industrialList, err := models.GetIndustrialListByarticleId(parsindustrial, conditionindustrial)
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ industrialMap := make(map[int][]*models.IndustrialManagementResp)
|
|
|
+ if len(industrialList) > 0 {
|
|
|
+ for _, v := range industrialList {
|
|
|
+ item := new(models.IndustrialManagementResp)
|
|
|
+ //item.ArticleId = v.ArticleId
|
|
|
+ item.IndustrialManagementId = v.IndustrialManagementId
|
|
|
+ item.IndustryName = v.IndustryName
|
|
|
+ item.ChartPermissionId = v.ChartPermissionId
|
|
|
+ industrialMap[v.ArticleId] = append(industrialMap[v.ArticleId], item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for k, v := range ListHzReport {
|
|
|
+ if len(industrialMap[v.ArticleId]) > 0 {
|
|
|
+ ListHzReport[k].List = industrialMap[v.ArticleId]
|
|
|
+ } else {
|
|
|
+ ListHzReport[k].List = make([]*models.IndustrialManagementResp, 0)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for k, v := range ListYxReport {
|
|
|
+ if len(industrialMap[v.ArticleId]) > 0 {
|
|
|
+ ListYxReport[k].List = industrialMap[v.ArticleId]
|
|
|
+ } else {
|
|
|
+ ListYxReport[k].List = make([]*models.IndustrialManagementResp, 0)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //获取文章关联的产业
|
|
|
+
|
|
|
if len(ListYxReport) == 0 {
|
|
|
ListYxReport = make([]*models.ArticleCollectionResp, 0)
|
|
|
}
|
|
@@ -2789,7 +2837,6 @@ func (this *ReportController) SearchReportAndResource() {
|
|
|
listYxResource[k].IsFollw = true
|
|
|
}
|
|
|
industrialIdArr = append(industrialIdArr, v.IndustrialManagementId)
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if len(industrialIdArr) > 0 {
|