zhangchuanxing vor 1 Woche
Ursprung
Commit
4707335e9c
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 2 2
      models/ficc_report/report.go

+ 2 - 2
models/ficc_report/report.go

@@ -152,11 +152,11 @@ func GetFiccRreportToCygxArticle(condition string, pars []interface{}) (items []
 	o := orm.NewOrmUsingDB("rddp")
 	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT	* FROM report WHERE state = 2 AND  is_public_publish = 1  	AND  report_layout != 3 
 	sql := ` SELECT	* FROM report WHERE state = 2 AND  is_public_publish = 1  	AND  report_layout != 3 
 			AND classify_name_first IN ('宏观报告','晨会纪要','调研纪要','数据点评','从宏观看商品')
 			AND classify_name_first IN ('宏观报告','晨会纪要','调研纪要','数据点评','从宏观看商品')
-			AND classify_name_second IN ('晨会纪要','黑色调研','宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报','铜行业数据点评','原油船期数据跟踪','从宏观看商品','铜行业跟踪')
+			AND classify_name_second IN ('晨会纪要','黑色调研','宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报','铜行业数据点评','原油船期数据跟踪','从宏观看商品','铜行业跟踪','商品宏观逻辑跟踪')
 			AND IF ( classify_name_first = '宏观报告' , classify_name_second IN  ('宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报')  ,1=1 )
 			AND IF ( classify_name_first = '宏观报告' , classify_name_second IN  ('宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报')  ,1=1 )
 			AND IF ( classify_name_first = '晨会纪要' , classify_name_second = '晨会纪要' ,1=1 )
 			AND IF ( classify_name_first = '晨会纪要' , classify_name_second = '晨会纪要' ,1=1 )
 			AND IF ( classify_name_first = '调研纪要' , classify_name_second = '黑色调研' ,1=1 ) 
 			AND IF ( classify_name_first = '调研纪要' , classify_name_second = '黑色调研' ,1=1 ) 
-			AND IF ( classify_name_first = '从宏观看商品' , classify_name_second = '从宏观看商品' ,1=1 ) 
+			AND IF ( classify_name_first = '从宏观看商品' , classify_name_second IN ('从宏观看商品','商品宏观逻辑跟踪')  ,1=1 ) 
 			AND IF ( classify_name_first = '数据点评' , classify_name_second  IN  ('铜行业数据点评','原油船期数据跟踪','铜行业跟踪') ,1=1 ) ` + condition + ` ORDER BY  modify_time	 DESC   `
 			AND IF ( classify_name_first = '数据点评' , classify_name_second  IN  ('铜行业数据点评','原油船期数据跟踪','铜行业跟踪') ,1=1 ) ` + condition + ` ORDER BY  modify_time	 DESC   `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 	return