Merge branch 'demand_943'

services/cygx_research_summary.go

@@ -72,7 +72,7 @@ func CygxResearchSummary(cont context.Context) (err error) {
 
 		//医药
 		{
-			newCondition := condition + ` AND category_id_two IN(65,102)`
+			newCondition := condition + ` AND category_id_two IN(65,102,1001)`
 			list, e := data_manage.GetReportArticleList(newCondition, pars)
 			if e != nil {
 				err = e
@@ -86,7 +86,7 @@ func CygxResearchSummary(cont context.Context) (err error) {
 
 		//消费
 		{
-			newCondition := condition + ` AND category_id_two IN(67,1008)`
+			newCondition := condition + ` AND category_id_two IN(67,1008,10075)`
 			list, e := data_manage.GetReportArticleList(newCondition, pars)
 			if e != nil {
 				err = e
@@ -100,7 +100,7 @@ func CygxResearchSummary(cont context.Context) (err error) {
 
 		//科技
 		{
-			newCondition := condition + ` AND category_id_two IN(57,69,1009)`
+			newCondition := condition + ` AND category_id_two IN(57,69,1009,64)`
 			list, e := data_manage.GetReportArticleList(newCondition, pars)
 			if e != nil {
 				err = e
@@ -114,7 +114,7 @@ func CygxResearchSummary(cont context.Context) (err error) {
 
 		//智造
 		{
-			newCondition := condition + ` AND category_id_two IN(66,85)`
+			newCondition := condition + ` AND category_id_two IN(66,85,87)`
 			list, e := data_manage.GetReportArticleList(newCondition, pars)
 			if e != nil {
 				err = e
@@ -438,6 +438,36 @@ func CygxResearchSummary(cont context.Context) (err error) {
 			}
 		}
 
+		//消费
+		{
+			//98：消费问答
+			newCondition := condition + ` AND category_id_two IN(10080) `
+			list, e := data_manage.GetReportArticleList(newCondition, pars)
+			if e != nil {
+				err = e
+				fmt.Println("GetReportArticleList err:", e)
+				return
+			}
+			for _, article := range list {
+				sjdpList = append(sjdpList, article)
+			}
+		}
+
+		//智造
+		{
+			//98：问道
+			newCondition := condition + ` AND category_id_two IN(10081) `
+			list, e := data_manage.GetReportArticleList(newCondition, pars)
+			if e != nil {
+				err = e
+				fmt.Println("GetReportArticleList err:", e)
+				return
+			}
+			for _, article := range list {
+				sjdpList = append(sjdpList, article)
+			}
+		}
+
 		var logItems []*data_manage.CygxResearchSummaryLog
 		for _, article := range sjdpList {
 			head := "<div class=\"title-content\">\n 【" + article.Title + "】    "