fix:研报阅读统计报表调整周报的统计

models/report_view.go

@@ -80,6 +80,40 @@ 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 <> "周报"
+			ORDER BY uvh.create_time DESC
+`
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, startTime, endTime).QueryRows(&items)
+	return
+}
+
+type RddpWeekReportViewersDetail struct {
+	RealName           string
+	CompanyName        string
+	CreatedTime        string //访问时间
+	ResearchReportName string
+	ReportVariety      string
+	ResearchReportType string
+	ReportCreateDate   string
+	ChapterTitle       string
+}
+
+func GetRddpWeekReportViewersDetail(startTime, endTime string) (items []*RddpWeekReportViewersDetail, err error) {
+	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 ,rc.title chapter_title,rc.type_name as report_variety
+FROM
+	hongze_rddp.report_view_record AS uvh
+	INNER JOIN hongze_rddp.report AS r ON uvh.report_id = r.id
+	INNER JOIN hongze_rddp.report_chapter AS rc ON uvh.report_id = rc.report_id and uvh.report_chapter_id=rc.report_chapter_id
+	INNER JOIN wx_user u ON u.user_id = uvh.user_id
+	INNER JOIN company c ON c.company_id = u.company_id 
+			WHERE uvh.create_time >?
+            AND uvh.create_time <=?
+			AND c.company_id NOT IN (1)
+			AND r.classify_name_first = "周报"
 			ORDER BY uvh.create_time DESC
 `
 	o := orm.NewOrm()
@@ -168,4 +202,4 @@ func GetAdvisoryViewersDetail(startTime, endTime string) (items []*ResearchRepor
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, startTime, endTime).QueryRows(&items)
 	return
-}
+}

services/company.go

@@ -349,7 +349,7 @@ func IncrementCompany(cont context.Context) (err error) {
 	fmt.Println("start send email")
 	//收取邮件的人
 	emailUser := "kwhuang@hzinsights.com;csun@hzinsights.com;sphuang@hzinsights.com;pyan@hzinsights.com"
-	sendResult := utils.SendEmailByHongze(title, "增量客户记录,\"你好，上周的增量客户记录列表见附件。", emailUser, savePath, title+".xlsx")
+	sendResult := utils.SendEmailByHongze(title, "增量客户记录,你好，上周的增量客户记录列表见附件。", emailUser, savePath, title+".xlsx")
 	if sendResult {
 		os.Remove(savePath)
 	}

services/report_view.go

@@ -35,7 +35,7 @@ func ReportViewTimes() (err error) {
 	cellD := rowTitle.AddCell()
 	cellD.Value = "最近一次访问日期"
 
-	rddpItems,err:=models.GetRddpHistoryViewTimes()
+	rddpItems, err := models.GetRddpHistoryViewTimes()
 
 	items, err := models.GetHistoryViewTimes()
 
@@ -76,7 +76,7 @@ func ReportViewTimes() (err error) {
 	//发送邮件
 	content := "你好，上周用户访问次数见附件。"
 	fmt.Println("start send email")
-	sendResult := utils.SendEmailByHongze(title, content, utils.EmailSendToHzUsers, savePath,title+".xlsx")
+	sendResult := utils.SendEmailByHongze(title, content, utils.EmailSendToHzUsers, savePath, title+".xlsx")
 	//sendResult:=utils.SendEmailByHongze(title,content,utils.EmailSendToMe,savePath)
 	if sendResult {
 		os.Remove(savePath)
@@ -105,7 +105,6 @@ func ReportViewDetail() (err error) {
 	advisory.TypeValue = "advisory"
 	typeList = append(typeList, advisory)
 
-
 	week := new(models.ReportType)
 	week.TypeName = "周报"
 	week.TypeValue = "week"
@@ -137,6 +136,68 @@ func ReportViewDetail() (err error) {
 	file := xlsx.NewFile()
 	for _, v := range typeList {
 		fmt.Println(v.TypeName, v.TypeValue)
+		if v.TypeName == `周报` {
+			sheet, err := file.AddSheet(v.TypeName + "研报阅读统计")
+			if err != nil {
+				return err
+			}
+			//标头
+			rowTitle := sheet.AddRow()
+			cellA := rowTitle.AddCell()
+			cellA.Value = "用户名称"
+			cellB := rowTitle.AddCell()
+			cellB.Value = "公司名称"
+			cellC := rowTitle.AddCell()
+			cellC.Value = "访问时间"
+			cellD := rowTitle.AddCell()
+			cellD.Value = "访问标题"
+			cellE := rowTitle.AddCell()
+			cellE.Value = "访问页面"
+			cellF := rowTitle.AddCell()
+			cellF.Value = "报告类型"
+
+			items, err := models.GetResearchReportViewersDetail(startTime, endTime, v.TypeValue)
+			if err != nil {
+				return err
+			}
+			for _, item := range items {
+				row := sheet.AddRow()
+				cellA := row.AddCell()
+				cellA.Value = item.RealName
+				cellB := row.AddCell()
+				cellB.Value = item.CompanyName
+				cellC := row.AddCell()
+				cellC.Value = item.CreatedTime
+				cellD := row.AddCell()
+				cellD.Value = item.ResearchReportName
+				cellE := row.AddCell()
+				cellE.Value = item.ReportVariety
+				cellF := row.AddCell()
+				cellF.Value = v.TypeName
+			}
+
+			//新周报的数据
+			weekItems, err := models.GetRddpWeekReportViewersDetail(startTime, endTime)
+			if err != nil {
+				return err
+			}
+			for _, item := range weekItems {
+				row := sheet.AddRow()
+				cellA := row.AddCell()
+				cellA.Value = item.RealName
+				cellB := row.AddCell()
+				cellB.Value = item.CompanyName
+				cellC := row.AddCell()
+				cellC.Value = item.CreatedTime
+				cellD := row.AddCell()
+				cellD.Value = item.ResearchReportName + "(" + item.ReportCreateDate + ")"
+				cellE := row.AddCell()
+				cellE.Value = item.ReportVariety
+				cellF := row.AddCell()
+				cellF.Value = v.TypeName
+			}
+			continue
+		}
 		if v.TypeValue == "rddp" {
 			sheet, err := file.AddSheet(v.TypeName + "阅读统计")
 			if err != nil {
@@ -248,7 +309,7 @@ func ReportViewDetail() (err error) {
 		}
 	}
 	title := "研报阅读统计报表"
-	savePath := "report_view_detail"+ time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
+	savePath := "report_view_detail" + time.Now().Format(utils.FormatDateTimeUnSpace) + ".xlsx"
 	err = file.Save("./" + savePath)
 	fmt.Println(err)
 	if err != nil {
@@ -256,7 +317,7 @@ func ReportViewDetail() (err error) {
 	}
 	//发送邮件
 	fmt.Println("start send email")
-	sendResult := utils.SendEmailByHongze(title, "你好，上周研报阅读统计见附件。", utils.EmailSendToHzUsers, savePath,title+".xlsx")
+	sendResult := utils.SendEmailByHongze(title, "你好，上周研报阅读统计见附件。", utils.EmailSendToHzUsers, savePath, title+".xlsx")
 	//sendResult:=utils.SendEmailByHongze(title,"你好，上周研报阅读统计见附件。",utils.EmailSendToMe,savePath)
 	if sendResult {
 		os.Remove(savePath)