fix:合同审批通过后，将原来的pdf换成现有的word

services/contract/contract_approval.go

@@ -725,25 +725,34 @@ func AfterApproved(contractId int) (err error) {
 		}
 		defer os.Remove(wordPath)
 
-		//word转pdf
-		converterType := "pdf"
-		pdfPath, tmpErr := services.FuncDocs2Pdf(utils.LibreOfficePath, wordPath, "./static", converterType)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		defer os.Remove(pdfPath)
+		////word转pdf
+		//converterType := "pdf"
+		//pdfPath, tmpErr := services.FuncDocs2Pdf(utils.LibreOfficePath, wordPath, "./static", converterType)
+		//if tmpErr != nil {
+		//	err = tmpErr
+		//	return
+		//}
+		//defer os.Remove(pdfPath)
+		//
+		////randStr := utils.GetRandStringNoSpecialChar(28)
+		////fileName := contractDetail.ContractCode + ".pdf"
+		//fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".pdf"
+		////非正式环境下，文件名上面还是加上随机数
+		//if utils.RunMode != "release" {
+		//	//fileName = contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+		//	fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+		//}
+		////上传到阿里云
+		//resourceUrl, tmpErr := services.UploadAliyun(fileName, pdfPath)
 
-		//randStr := utils.GetRandStringNoSpecialChar(28)
-		//fileName := contractDetail.ContractCode + ".pdf"
-		fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".pdf"
+		fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".docx"
 		//非正式环境下，文件名上面还是加上随机数
 		if utils.RunMode != "release" {
 			//fileName = contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
-			fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+			fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".docx"
 		}
 		//上传到阿里云
-		resourceUrl, tmpErr := services.UploadAliyun(fileName, pdfPath)
+		resourceUrl, tmpErr := services.UploadAliyun(fileName, wordPath)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -842,25 +851,34 @@ func FixPdf(contractId int) (err error) {
 		}
 		defer os.Remove(wordPath)
 
-		//word转pdf
-		converterType := "pdf"
-		pdfPath, tmpErr := services.FuncDocs2Pdf(utils.LibreOfficePath, wordPath, "./static", converterType)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		defer os.Remove(pdfPath)
+		////word转pdf
+		//converterType := "pdf"
+		//pdfPath, tmpErr := services.FuncDocs2Pdf(utils.LibreOfficePath, wordPath, "./static", converterType)
+		//if tmpErr != nil {
+		//	err = tmpErr
+		//	return
+		//}
+		//defer os.Remove(pdfPath)
+		//
+		////randStr := utils.GetRandStringNoSpecialChar(28)
+		////fileName := contractDetail.ContractCode + ".pdf"
+		//fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".pdf"
+		////非正式环境下，文件名上面还是加上随机数
+		//if utils.RunMode != "release" {
+		//	//fileName = contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+		//	fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+		//}
+		////上传到阿里云
+		//resourceUrl, tmpErr := services.UploadAliyun(fileName, pdfPath)
 
-		//randStr := utils.GetRandStringNoSpecialChar(28)
-		//fileName := contractDetail.ContractCode + ".pdf"
-		fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".pdf"
+		fileName := contractDetail.CompanyName + "_" + contractDetail.ContractCode + ".docx"
 		//非正式环境下，文件名上面还是加上随机数
 		if utils.RunMode != "release" {
 			//fileName = contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
-			fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+			fileName = contractDetail.CompanyName + "_" + contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".docx"
 		}
 		//上传到阿里云
-		resourceUrl, tmpErr := services.UploadAliyun(fileName, pdfPath)
+		resourceUrl, tmpErr := services.UploadAliyun(fileName, wordPath)
 		if tmpErr != nil {
 			err = tmpErr
 			return