fix

models/report_approve/report_approve.go

@@ -199,8 +199,8 @@ type ReportApproveItem struct {
 	HandleTime            string `description:"处理时间"`
 	CreateTime            string `description:"创建时间"`
 	ModifyTime            string `description:"修改时间"`
-	DetailImgUrl       string    `description:"报告详情长图地址"`
-	DetailPdfUrl       string    `description:"报告详情PDF地址"`
+	DetailImgUrl          string `description:"报告详情长图地址"`
+	DetailPdfUrl          string `description:"报告详情PDF地址"`
 }
 
 // FormatReportApproveOrm2Item 格式化报告审批
@@ -328,7 +328,7 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.state AS record_state,a.node_state,a.node_approve_time, a.node_approve_time AS handle_time, b.*
+	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.node_state AS record_state,a.node_state,a.node_approve_time, a.node_approve_time AS handle_time, b.*
 		FROM report_approve_record AS a
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
 		WHERE 1 = 1 %s %s

services/report_approve.go

@@ -701,7 +701,7 @@ func RefuseReportApprove(approveItem *report_approve.ReportApprove, recordItem *
 	recordItem.ApproveTime = now
 	recordItem.ModifyTime = now
 
-	recordItem.NodeState = report_approve.ReportApproveStatePass
+	recordItem.NodeState = report_approve.ReportApproveStateRefuse
 	recordItem.NodeApproveUserId = recordItem.ApproveUserId
 	recordItem.NodeApproveUserName = recordItem.ApproveUserName
 	recordItem.NodeApproveTime = now
@@ -844,6 +844,9 @@ func AfterReportApprovePass(reportType, reportId int) (err error) {
 		//_ = CreateVideo(reportInfo)
 		_ = UpdateReportEs(reportInfo.Id, models.ReportStatePublished)
 
+		// 生成报告pdf和长图
+		go Report2pdfAndJpeg(reportUrl, reportId, 1)
+
 		return
 	}
 

services/report_v2.go

@@ -1370,3 +1370,7 @@ func UpdateReportVideo(reportInfo *models.Report) {
 		}
 	}
 }
+
+func GeneralPdfUrl(reportCode string, adminInfo *system.Admin) {
+
+}