Ver código fonte

后端: hse证书模板

baichengfei 4 anos atrás
pai
commit
ede5f37f8f

+ 10 - 10
src/dashoo.cn/backend/api/controllers/oilsupplier/hsescore.go

@@ -563,18 +563,18 @@ func (this *HSEScoreController) ExportWord() {
 	fileName := "HSE培训合格证书.docx"
 
 	retDocUrl := svcActiviti.FillWordTemplate(dataMap, url, fileName)
-	//model.Ip = strings.Replace(model.Ip, "60.30.245.229", "10.76.248.23", -1)
-	// 转成pdf
-	//if strings.Contains(retDocUrl, "upfile") {
-	//	retDocUrl = "http://" + model.Ip + "/" + retDocUrl
-	//} else {
-	//	retDocUrl = "http://" + retDocUrl
-	//}
-	//pdfUrl := svcActiviti.WordToPdf(retDocUrl)
+	model.Ip = strings.Replace(model.Ip, "60.30.245.229", "10.76.248.23", -1)
+	//转成pdf
+	if strings.Contains(retDocUrl, "upfile") {
+		retDocUrl = "http://" + model.Ip + "/" + retDocUrl
+	} else {
+		retDocUrl = "http://" + retDocUrl
+	}
+	pdfUrl := svcActiviti.WordToPdf(retDocUrl)
 	var datainfo ErrorDataInfo
 	datainfo.Code = 0
-	//datainfo.Item = retDocUrl
-	this.Data["json"] = retDocUrl
+	datainfo.Item = pdfUrl
+	this.Data["json"] = pdfUrl
 	this.ServeJSON()
 
 }