fix：年报合集、会议纪要、需求报告

models/report_view.go

@@ -80,7 +80,7 @@ func GetRddpReportViewersDetail(startTime, endTime string) (items []*ResearchRep
 			WHERE uvh.create_time >?
             AND uvh.create_time <=?
 			AND c.company_id NOT IN (1)
-			AND r.classify_name_first not in ("周报","双周报","月报","数据点评")
+			AND r.classify_name_first not in ("周报","双周报","月报","数据点评","会议纪要","年报合集","需求报告")
 			ORDER BY uvh.create_time DESC
 `
 	o := orm.NewOrm()
@@ -97,6 +97,7 @@ type RddpWeekReportViewersDetail struct {
 	ResearchReportType string
 	ReportCreateDate   string
 	ChapterTitle       string
+	ClassifyNameFirst  string
 	ClassifyNameSecond string
 }
 
@@ -170,7 +171,7 @@ func GetRddpDataReviewReportViewersDetail(startTime, endTime string) (items []*R
 	sql := `
 			SELECT
 	u.real_name,c.company_name,uvh.create_time AS created_time,REPLACE ( SUBSTRING( r.create_time, 6, 5 ), '-', '' ) AS report_create_date,
-	r.title AS research_report_name,r.classify_name_second AS research_report_type,r.classify_name_second 
+	r.title AS research_report_name,r.classify_name_second AS research_report_type,r.classify_name_second,r.classify_name_first 
 FROM
 	hongze_rddp.report_view_record AS uvh
 	INNER JOIN hongze_rddp.report AS r ON uvh.report_id = r.id
@@ -179,7 +180,7 @@ FROM
 			WHERE uvh.create_time >?
             AND uvh.create_time <=?
 			AND c.company_id NOT IN (1)
-			AND r.classify_name_first = "数据点评"
+			AND r.classify_name_first IN ("数据点评","会议纪要","年报合集","需求报告")
 			ORDER BY uvh.create_time DESC
 `
 	o := orm.NewOrm()

services/report_view.go

@@ -377,7 +377,7 @@ func ReportViewDetail() (err error) {
 				cellE := row.AddCell()
 				cellE.Value = item.ClassifyNameSecond
 				cellF := row.AddCell()
-				cellF.Value = `数据点评`
+				cellF.Value = item.ClassifyNameFirst
 			}
 			continue
 		}