no message

controllers/report.go

@@ -86,9 +86,21 @@ func (this *MobileReportController) TradeList() {
 			}
 		}
 	} else {
-		listTrade, errTrade := models.GetTradeAll(ChartPermissionId)
-		err = errTrade
-		list = listTrade
+		listCategory, err := models.GetTradeArticleAndProductInterior(ChartPermissionId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+
+		categoryMap := make(map[int]int)
+		for _, v := range listCategory {
+			if categoryMap[v.CategoryId] > 0 {
+				continue
+			}
+			categoryMap[v.CategoryId] = v.CategoryId
+			list = append(list, v)
+		}
 	}
 
 	if err != nil {
@@ -99,8 +111,8 @@ func (this *MobileReportController) TradeList() {
 
 	for k, v := range list {
 
-		var condition string
-		var pars []interface{}
+		//var condition string
+		//var pars []interface{}
 
 		//categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(v.CategoryId)
 		//if errCategory != nil {
@@ -114,11 +126,11 @@ func (this *MobileReportController) TradeList() {
 		//	condition = ` AND a.category_id IN(` + strconv.Itoa(v.CategoryId) + `)`
 		//}
 
-		if v.PolymerizationId != "" {
-			condition = ` AND a.category_id IN(` + v.PolymerizationId + `)`
-		} else {
-			condition = ` AND a.category_id IN(` + strconv.Itoa(v.CategoryId) + `)`
-		}
+		//if v.PolymerizationId != "" {
+		//	condition = ` AND a.category_id IN(` + v.PolymerizationId + `)`
+		//} else {
+		//	condition = ` AND a.category_id IN(` + strconv.Itoa(v.CategoryId) + `)`
+		//}
 
 		if ChartPermissionId != utils.CE_LUE_ID && ChartPermissionId != utils.GU_SHOU_ID {
 			var pageSize int
@@ -129,7 +141,7 @@ func (this *MobileReportController) TradeList() {
 			//}
 
 			pageSize = 3
-			listArticle, err := models.GetHomeList(condition, pars, 0, pageSize)
+			listArticle, _, err := models.GetReportAndproductIndustrylList(v.CategoryId, 0, pageSize)
 			if err != nil {
 				br.Msg = "获取信息失败"
 				br.Msg = "GetHomeList，Err:" + err.Error()
@@ -138,15 +150,15 @@ func (this *MobileReportController) TradeList() {
 
 			if len(listArticle) > 0 {
 				list[k].UpdateTime = utils.StrTimeToTime(listArticle[0].PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
-				count, err := models.CheckThisCategoryNewArticleIsRead(uid, v.CategoryId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取帖子总数失败，Err:" + err.Error()
-					return
-				}
-				if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.UpdateTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.UpdateTime)) {
-					list[k].IsRed = true
-				}
+				//count, err := models.CheckThisCategoryNewArticleIsRead(uid, v.CategoryId)
+				//if err != nil {
+				//	br.Msg = "获取信息失败"
+				//	br.ErrMsg = "获取帖子总数失败，Err:" + err.Error()
+				//	return
+				//}
+				//if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.UpdateTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.UpdateTime)) {
+				//	list[k].IsRed = true
+				//}
 			}
 			list[k].ListArticle = listArticle
 		} else {
@@ -2046,15 +2058,16 @@ func (this *MobileReportController) TacticsList() {
 		currentIndex = 1
 	}
 	startSize = paging.StartIndex(currentIndex, pageSize)
-	var condition string
-	var pars []interface{}
+	//var condition string
+	//var pars []interface{}
 	var total int
+	var err error
 	resp := new(models.TacticsListResp)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	list := make([]*models.ArticleListResp, 0)
 
 	if categoryId == utils.TIME_CATEGORYID {
-		var err error
+
 		list, total, err = models.GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -2063,99 +2076,106 @@ func (this *MobileReportController) TacticsList() {
 		}
 	} else {
 		//获取该产业下所对应的行业图片
-		var reportType int
-		if industrialManagementId > 0 {
-			reportType = 2
-		} else {
-			reportType = 1
-		}
-		detail, errCategory := models.GetdetailByCategoryIdOne(categoryId, reportType)
-		if errCategory != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
-			return
-		}
-		//对应行业的图片
-		detailChartPermissionUrl, err := models.GetConfigByCode("category_chart_permissionimg_url")
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-			return
-		}
-		chartPermissionUrlList := strings.Split(detailChartPermissionUrl.ConfigValue, "{|}")
-		mapChartPermission := make(map[string]string)
-		var permissionName string
-		var imgUrlChartPermission string
-		for _, v := range chartPermissionUrlList {
-			vslice := strings.Split(v, "_")
-			permissionName = vslice[0]
-			imgUrlChartPermission = vslice[len(vslice)-1]
-			mapChartPermission[permissionName] = imgUrlChartPermission
-		}
-
-		//对应分类的所图片
-		detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
-		if err != nil {
-			br.Msg = "获取数据失败"
-			br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-			return
-		}
-		categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
-		mapCategoryUrl := make(map[string]string)
-		var categoryIdStr string
-		var imgUrlChart string
-		for _, v := range categoryUrlList {
-			vslice := strings.Split(v, "_")
-			categoryIdStr = vslice[0]
-			imgUrlChart = vslice[len(vslice)-1]
-			mapCategoryUrl[categoryIdStr] = imgUrlChart
-		}
-		if detail.CeLueFieldId != "" {
-			condition = ` AND ce_lue_field_id IN(` + detail.CeLueFieldId + `)`
-		} else if detail.PolymerizationId != "" {
-			condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
-		} else {
-			categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
-			if errCategory != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
-				return
-			}
-			if categoryIdSet != "" {
-				condition = ` AND category_id IN(` + categoryIdSet + `)`
-			} else {
-				condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
-			}
-		}
-
-		if industrialManagementId > 0 {
-			industrialManageentList, err := models.GetIndustrialArticleGroupManagementByIndustrialManagementId(industrialManagementId)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.Msg = "获取产业关联的文章ID失败，GetIndustrialArticleGroupManagementByIndustrialManagementIdErr:" + err.Error()
-				return
-			}
-			articleIdList := make([]string, 0)
-			for _, v := range industrialManageentList {
-				articleIdList = append(articleIdList, strconv.Itoa(v.ArticleId))
-			}
-			condition += ` AND a.article_id IN (  ` + utils.GetOrmInReplace(len(articleIdList)) + ` )  `
-			pars = append(pars, articleIdList)
-		}
+		//var reportType int
+		//if industrialManagementId > 0 {
+		//	reportType = 2
+		//} else {
+		//	reportType = 1
+		//}
+		//detail, errCategory := models.GetdetailByCategoryIdOne(categoryId, reportType)
+		//if errCategory != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
+		//	return
+		//}
+		////对应行业的图片
+		//detailChartPermissionUrl, err := models.GetConfigByCode("category_chart_permissionimg_url")
+		//if err != nil {
+		//	br.Msg = "获取数据失败"
+		//	br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+		//	return
+		//}
+		//chartPermissionUrlList := strings.Split(detailChartPermissionUrl.ConfigValue, "{|}")
+		//mapChartPermission := make(map[string]string)
+		//var permissionName string
+		//var imgUrlChartPermission string
+		//for _, v := range chartPermissionUrlList {
+		//	vslice := strings.Split(v, "_")
+		//	permissionName = vslice[0]
+		//	imgUrlChartPermission = vslice[len(vslice)-1]
+		//	mapChartPermission[permissionName] = imgUrlChartPermission
+		//}
+		//
+		////对应分类的所图片
+		//detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
+		//if err != nil {
+		//	br.Msg = "获取数据失败"
+		//	br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+		//	return
+		//}
+		//categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
+		//mapCategoryUrl := make(map[string]string)
+		//var categoryIdStr string
+		//var imgUrlChart string
+		//for _, v := range categoryUrlList {
+		//	vslice := strings.Split(v, "_")
+		//	categoryIdStr = vslice[0]
+		//	imgUrlChart = vslice[len(vslice)-1]
+		//	mapCategoryUrl[categoryIdStr] = imgUrlChart
+		//}
+		//if detail.CeLueFieldId != "" {
+		//	condition = ` AND ce_lue_field_id IN(` + detail.CeLueFieldId + `)`
+		//} else if detail.PolymerizationId != "" {
+		//	condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
+		//} else {
+		//	categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
+		//	if errCategory != nil {
+		//		br.Msg = "获取信息失败"
+		//		br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
+		//		return
+		//	}
+		//	if categoryIdSet != "" {
+		//		condition = ` AND category_id IN(` + categoryIdSet + `)`
+		//	} else {
+		//		condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
+		//	}
+		//}
+		//
+		//if industrialManagementId > 0 {
+		//	industrialManageentList, err := models.GetIndustrialArticleGroupManagementByIndustrialManagementId(industrialManagementId)
+		//	if err != nil {
+		//		br.Msg = "获取信息失败"
+		//		br.Msg = "获取产业关联的文章ID失败，GetIndustrialArticleGroupManagementByIndustrialManagementIdErr:" + err.Error()
+		//		return
+		//	}
+		//	articleIdList := make([]string, 0)
+		//	for _, v := range industrialManageentList {
+		//		articleIdList = append(articleIdList, strconv.Itoa(v.ArticleId))
+		//	}
+		//	condition += ` AND a.article_id IN (  ` + utils.GetOrmInReplace(len(articleIdList)) + ` )  `
+		//	pars = append(pars, articleIdList)
+		//}
 
-		total, err = models.GetHomeCount(condition, pars)
+		list, total, err = models.GetReportAndproductIndustrylListimg(categoryId, user.UserId, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.Msg = "获取帖子总数失败，Err:" + err.Error()
+			br.Msg = "GetHomeList，Err:" + err.Error()
 			return
 		}
 
-		list, err = models.GetHomeListNew(condition, pars, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.Msg = "获取帖子数据失败，Err:" + err.Error()
-			return
-		}
+		//total, err = models.GetHomeCount(condition, pars)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.Msg = "获取帖子总数失败，Err:" + err.Error()
+		//	return
+		//}
+		//
+		//list, err = models.GetHomeListNew(condition, pars, startSize, pageSize)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.Msg = "获取帖子数据失败，Err:" + err.Error()
+		//	return
+		//}
 		articleIdMap, err := services.GetUserArticleHistoryRecord(user)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -2163,13 +2183,13 @@ func (this *MobileReportController) TacticsList() {
 			return
 		}
 		for k, v := range list {
-			list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
+			//list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
 			if !articleIdMap[v.ArticleId] && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishDate)) {
 				list[k].IsRed = true
 			}
 		}
 		if categoryId > 0 {
-			detail, errCategory := models.GetdetailByCategoryId(categoryId)
+			detail, errCategory := models.GetCygxReportMappingCygxByCategoryId(categoryId)
 			if errCategory != nil {
 				br.Msg = "获取信息失败"
 				br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
@@ -2177,7 +2197,7 @@ func (this *MobileReportController) TacticsList() {
 			}
 			resp.MatchTypeName = detail.MatchTypeName
 		}
-		resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
+		//resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
 	}
 
 	listPublic, err := services.HandleArticleCategoryImg(list, user)

models/article_category_mapping.go

@@ -0,0 +1,96 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+	//"time"
+)
+
+type CygxArticleCategoryMapping struct {
+	Id                  int    `orm:"column(id);pk" description:"id"`
+	ChartPermissionId   int    `description:"行业ID"`
+	CategoryId          int    `description:"分类ID"`
+	ChartPermissionName string `description:"行业名称"`
+	MatchTypeName       string `description:"分类名称"`
+	ReportType          int    `description:"报告类型，2产业报告，1行业报告"`
+	SubCategoryName     string `description:"主题"`
+	Sort                int    `description:"排序"`
+	IsCustom            int    `description:"是否属于自定义的匹配类型 ，1是，0否"`
+	IsSummary           int    `description:"是否是纪要库，1是，0否"`
+	IsReport            int    `description:"是否是报告，1是，0否"`
+	PermissionType      int    `description:"1主观，2客观"`
+	CygxId              int    `description:"分类聚合ID"`
+	CeLueId             int    `description:"策略平台领域ID"`
+}
+
+// 添加
+func AddCygxArticleCategoryMapping(item *CygxArticleCategoryMapping) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+type CygxReportMappingCygx struct {
+	Id                  int    `orm:"column(id);pk" description:"id"`
+	ChartPermissionId   int    `description:"行业ID"`
+	ChartPermissionName string `description:"行业名称"`
+	MatchTypeName       string `description:"分类名称"`
+	ReportType          int    `description:"报告类型，2产业报告，1行业报告"`
+	Sort                int    `description:"排序"`
+	IsCustom            int    `description:"是否属于自定义的匹配类型 ，1是，0否"`
+	IsSummary           int    `description:"是否是纪要库，1是，0否"`
+	IsReport            int    `description:"是否是报告，1是，0否"`
+	PermissionType      int    `description:"1主观，2客观"`
+}
+
+type CygxReportMappingGroup struct {
+	Id              int       `orm:"column(id);pk" description:"id"`
+	IdCygx          int       `description:"分类ID"`
+	CategoryIdCelue int       `description:"分类ID"`
+	CreateTime      time.Time `description:"创建时间"`
+	ModifyTime      time.Time `description:"更新时间"`
+}
+
+// 添加
+func AddCygxReportMappingGroup(item *CygxReportMappingGroup) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+// 添加
+func AddCygxReportMappingCygx(item *CygxReportMappingCygx) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+// 获取数量
+func GetCygxReportMappingCygxCount(condition string) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_report_mapping_cygx as art WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount).QueryRow(&count)
+	return
+}
+
+// 获取所有的报告分类 查研观向
+func GetCygxReportMappingCygx() (items []*CygxReportMappingCygx, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+				* 
+			FROM
+				cygx_report_mapping_cygx `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// 通过分类ID获取详情
+func GetCygxReportMappingCygxByCategoryId(categoryId int) (item *CygxReportMappingCygx, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_report_mapping_cygx WHERE  id=? `
+	err = o.Raw(sql, categoryId).QueryRow(&item)
+	return
+}

models/report.go

@@ -157,6 +157,76 @@ func GetReoprtSearchList(condition string, userId, startSize, pageSize int) (ite
 	return
 } //end
 
+// 获取行业报告列表
+func GetReportAndproductIndustrylList(categoryId, startSize, pageSize int) (items []*HomeArticle, total int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			art.article_id,
+			art.title,
+			art.publish_date,
+			1 AS resource 
+		FROM
+			cygx_article AS art 
+		WHERE
+			art.publish_status = 1 
+			AND category_id IN ( SELECT category_id_celue FROM cygx_report_mapping_group WHERE id_cygx = ` + strconv.Itoa(categoryId) + ` ) UNION ALL
+		SELECT
+			art.product_interior_id AS article_id,
+			art.title,
+			art.publish_time AS publish_date,
+			2 AS resource 
+		FROM
+			cygx_product_interior AS art 
+		WHERE
+			art.STATUS = 1 
+			AND art.visible_range = 1 
+			AND art.match_type_id = ` + strconv.Itoa(categoryId)
+	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	err = o.Raw(totalSql).QueryRow(&total)
+	sql += `    ORDER BY publish_date DESC LIMIT ?,? `
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+// 获取行业报告列表
+func GetReportAndproductIndustrylListimg(categoryId, userId, startSize, pageSize int) (items []*ArticleListResp, total int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			art.article_id,
+			art.body,
+			art.annotation,
+			art.abstract,
+			art.category_id,
+			art.title,
+			art.publish_date,
+			( SELECT COUNT( 1 ) FROM cygx_article_history_record AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.article_id = art.article_id ) AS readnum 
+		FROM
+			cygx_article AS art 
+		WHERE
+			art.publish_status = 1 
+			AND category_id IN ( SELECT category_id_celue FROM cygx_report_mapping_group WHERE id_cygx = ` + strconv.Itoa(categoryId) + ` ) UNION ALL
+		SELECT
+			art.product_interior_id AS article_id,
+			art.body,
+			"",
+			art.abstract,
+			0 as  category_id,
+			art.title,
+			art.publish_time AS publish_date,
+			( SELECT COUNT( 1 ) FROM cygx_product_interior_history AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.product_interior_id = art.product_interior_id ) AS readnum
+		FROM
+			cygx_product_interior AS art 
+		WHERE
+			art.STATUS = 1 
+			AND art.visible_range = 1 
+			AND art.match_type_id = ` + strconv.Itoa(categoryId)
+	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
+	err = o.Raw(totalSql).QueryRow(&total)
+	sql += `    ORDER BY publish_date DESC LIMIT ?,? `
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 // 列表
 func GetSearchResourceList(condition string) (items []*IndustrialManagement, err error) {
 	o := orm.NewOrm()

models/report_mapping.go

@@ -188,3 +188,46 @@ type ReportMappingStatistical struct {
 	Pv              int    `description:"Pv"`
 	Uv              int    `description:"Uv"`
 }
+
+// 行业列表
+func GetTradeArticleAndProductInterior(ChartPermissionId int) (items []*TradeReportMapping, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			map.sort,
+			map.match_type_name,
+			map.id AS category_id 
+		FROM
+			cygx_report_mapping_cygx AS map
+			INNER JOIN cygx_report_mapping_group AS g ON g.id_cygx = map.id
+			INNER JOIN cygx_report_mapping_celue AS cl ON cl.category_id = g.category_id_celue
+			INNER JOIN cygx_article AS art ON art.category_id = cl.category_id 
+		WHERE
+			1 = 1 
+			AND map.report_type = 1 
+			AND map.is_report = 1 
+			AND art.is_report = 1 
+			AND art.publish_status = 1 
+			AND map.chart_permission_id = ? 
+		GROUP BY
+			match_type_name UNION ALL
+		SELECT
+			map.sort,
+			map.match_type_name,
+			map.id AS category_id 
+		FROM
+			cygx_report_mapping_cygx AS map
+			INNER JOIN cygx_industrial_management AS im ON im.chart_permission_id = map.chart_permission_id
+			INNER JOIN cygx_product_interior AS art ON art.match_type_id = map.id 
+		WHERE
+			1 = 1 
+			AND art.STATUS = 1 
+			AND art.visible_range = 1 
+			AND map.report_type = 1 
+			AND map.chart_permission_id = ? 
+		GROUP BY
+			match_type_name 
+		ORDER BY
+			sort DESC `
+	_, err = o.Raw(sql, ChartPermissionId, ChartPermissionId).QueryRows(&items)
+	return
+}

services/article.go

@@ -128,6 +128,7 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 		item := list[k]
 		//如果文章一开始的内容是图片，优先展示第一张图片
 		//newBody, _ := GetReportContentTextSubByarticle(item.Body, item.Annotation, item.ArticleId)
+		list[k].Resource = item.Resource
 		list[k].Annotation = ArticleAnnotation(item)
 		list[k].Body = ""
 		list[k].Abstract, _ = GetReportContentTextSub(v.Abstract)

services/industrial_management.go

@@ -108,7 +108,7 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		if resource == "Yx" {
 			condition = ` AND a.publish_status = 1 AND a.article_type_id  IN (` + articleTypeIds + `)	`
 		} else {
-			condition = ` AND a.article_type_id  NOT  IN (` + articleTypeIds + `)  AND  a.article_id <  1000000	`
+			condition = ` AND a.article_type_id  NOT  IN (` + articleTypeIds + `)  	`
 		}
 	}
 
@@ -178,14 +178,13 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		parsindustrial = append(parsindustrial, industrialIdArr)
 		listUpdateTime, e := models.GetNewArticleDetailByIndustrialIds(parsindustrial, conditionindustrial)
 		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetNewArticleDetailByIndustrialIds Err " + err.Error())
+			err = errors.New("GetNewArticleDetailByIndustrialIds Err " + e.Error())
 			return
 		}
 		for _, v := range listUpdateTime {
 			mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
 			articleIdArr = append(articleIdArr, v.ArticleId)
 		}
-
 		//时间线的更新时间
 		//	maptimelineUPdateTime := make(map[int]string)
 		listtimelinePublishdate, e := models.GetTimeLineReportIndustrialPublishdateList(industrialIdArr)
@@ -200,7 +199,6 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 				}
 			}
 		}
-
 		//产品内测的更新时间线
 		listtProductInterior, e := models.GetNewProductInteriorByIndustrialIds(industrialIdArr)
 		if e != nil && e.Error() != utils.ErrNoRow() {
@@ -214,7 +212,6 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 				}
 			}
 		}
-
 		for _, id := range industrialIdArr {
 			industrialIds += strconv.Itoa(id) + ","
 		}