diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java index 41a6f15f..bedf7a1f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java @@ -320,10 +320,12 @@ public class ZyJxdgController extends JeecgController { Global global = SpringContextHolder.getBean(Global.class); FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); - String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); +// String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); + String docPath = zyJxdg.getFilePath(); String namePath = dd + ".pdf"; String pdfPath = global.getContractDickPath() + namePath; - PDFUtil.office2PDF(docPath,pdfPath); + Map map = zykService.downloadRemoteFile(docPath); + PDFUtil.office2PDF(map.get("data"),pdfPath); zyJxdg.setPdfPath("contract/"+namePath); } }else{ @@ -340,8 +342,8 @@ public class ZyJxdgController extends JeecgController { zykInfo.setFileName(zyJxdg.getFilePath()); zykInfo.setPdfName(zyJxdg.getPdfPath()); Map map = zykService.saveToZyk(zykInfo); - String fileName = map.get("fileName"); - String pdfName = map.get("pdfName"); + String fileName = map.get("data"); + String pdfName = map.get("pdfData"); zyJxdg.setFilePath(fileName); zyJxdg.setPdfPath(pdfName); }