|
@@ -150,7 +150,7 @@ func GetByReportId(reportId int) (item *Report, err error) {
|
|
|
|
|
|
|
|
func GetFiccRreportToCygxArticle(condition string, pars []interface{}) (items []*Report, err error) {
|
|
func GetFiccRreportToCygxArticle(condition string, pars []interface{}) (items []*Report, err error) {
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
- sql := ` SELECT * FROM report WHERE state = 2 AND is_public_publish = 1
|
|
|
|
|
|
|
+ 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 )
|
