Merge branch 'ETA_1.8.1' into debug

services/report_approve.go

@@ -655,11 +655,14 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 
 		// 审批通过之后的处理
 		go func() {
-			if e = AfterReportApprovePass(approveItem.ReportType, approveItem.ReportId, reportUrl); e != nil {
+			if e = AfterReportApprovePass(approveItem.ReportType, approveItem.ReportId); e != nil {
 				utils.FileLog.Info(fmt.Sprintf("AfterReportApprovePass err: %s, ReportType: %d, ReportId: %d", e.Error(), approveItem.ReportType, approveItem.ReportId))
 				return
 			}
 		}()
+
+		// 生成报告pdf和长图
+		go Report2pdfAndJpeg(reportUrl, approveItem.ReportId, approveItem.ReportType)
 	}
 	return
 }
@@ -795,7 +798,7 @@ func BuildNextNodeRecordAndMsg(approveNodeItem *report_approve.ReportApproveNode
 }
 
 // AfterReportApprovePass 报告审批通过后的处理
-func AfterReportApprovePass(reportType, reportId int, reportUrl string) (err error) {
+func AfterReportApprovePass(reportType, reportId int) (err error) {
 	// 中文研报
 	if reportType == report_approve.FlowReportTypeChinese {
 		report, e := models.GetReportById(reportId)
@@ -809,18 +812,12 @@ func AfterReportApprovePass(reportType, reportId int, reportUrl string) (err err
 		_ = CreateVideo(report)
 		_ = UpdateReportEs(report.Id, models.ReportStatePublished)
 
-		// 生成报告pdf和长图
-		go Report2pdfAndJpeg(reportUrl, reportId, 1)
-
 		return
 	}
 
 	// 英文研报
 	if reportType == report_approve.FlowReportTypeEnglish {
 		_ = UpdateEnglishReportEs(reportId, models.ReportStatePublished)
-
-		// 生成报告pdf和长图
-		go Report2pdfAndJpeg(reportUrl, reportId, 2)
 		return
 	}
 
@@ -849,9 +846,6 @@ func AfterReportApprovePass(reportType, reportId int, reportUrl string) (err err
 
 		// ES更新报告
 		_ = SmartReportElasticUpsert(item.SmartReportId, models.ReportStatePublished)
-
-		// 生成报告pdf和长图
-		go Report2pdfAndJpeg(reportUrl, item.SmartReportId, 3)
 	}
 	return
 }