Compare commits

...

3 Commits

Author SHA1 Message Date
yangjun 83d9a7f79a 添加pdf工具使用 2024-05-25 16:16:58 +08:00
yangjun 0cade225f1 Merge remote-tracking branch 'origin/master' 2024-05-25 15:54:40 +08:00
yangjun c89282fcb2 修改判断条件 2024-05-25 14:49:46 +08:00
1 changed files with 18 additions and 14 deletions

View File

@ -320,10 +320,12 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
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<String,String> map = zykService.downloadRemoteFile(docPath);
PDFUtil.office2PDF(map.get("data"),pdfPath);
zyJxdg.setPdfPath("contract/"+namePath);
}
}else{
@ -331,18 +333,20 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
}
//--------上传ftp工具---------------
// Map<String,String> saveToZyk(ZykInfo zykInfo);
ZykInfo zykInfo = new ZykInfo();
zykInfo.setBizId(zyJxdg.getId());
zykInfo.setBizTable("zy_jxdg");
zykInfo.setWjlx(WjlxEnum.JXDG.getType());
zykInfo.setRwbh(zyJxdg.getRwbh());
zykInfo.setFileName(zyJxdg.getFilePath());
zykInfo.setPdfName(zyJxdg.getPdfPath());
Map<String,String> map = zykService.saveToZyk(zykInfo);
String fileName = map.get("fileName");
String pdfName = map.get("pdfName");
zyJxdg.setFilePath(fileName);
zyJxdg.setPdfPath(pdfName);
if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){
ZykInfo zykInfo = new ZykInfo();
zykInfo.setBizId(zyJxdg.getId());
zykInfo.setBizTable("zy_jxdg");
zykInfo.setWjlx(WjlxEnum.JXDG.getType());
zykInfo.setRwbh(zyJxdg.getRwbh());
zykInfo.setFileName(zyJxdg.getFilePath());
zykInfo.setPdfName(zyJxdg.getPdfPath());
Map<String,String> map = zykService.saveToZyk(zykInfo);
String fileName = map.get("data");
String pdfName = map.get("pdfData");
zyJxdg.setFilePath(fileName);
zyJxdg.setPdfPath(pdfName);
}
//--------上传ftp工具---------------