yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:83d9a7f79a91d3cc494e96ebf2713cb4f23c2a26
Branches Tags
yangjun:master
..
compare: yangjun:2a2581db3b116ee0427355925c5e8bce87b6bba1
Branches Tags
yangjun:master

No commits in common. "83d9a7f79a91d3cc494e96ebf2713cb4f23c2a26" and "2a2581db3b116ee0427355925c5e8bce87b6bba1" have entirely different histories.
83d9a7f79a ... 2a2581db3b

1 changed files with 14 additions and 18 deletions
Show Stats Expand all files Collapse all files

32
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
View File

@ -320,12 +320,10 @@ 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 = zyJxdg.getFilePath();
String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath();
String namePath = dd + ".pdf";
String pdfPath = global.getContractDickPath() + namePath;
Map<String,String> map = zykService.downloadRemoteFile(docPath);
PDFUtil.office2PDF(map.get("data"),pdfPath);
PDFUtil.office2PDF(docPath,pdfPath);
zyJxdg.setPdfPath("contract/"+namePath);
}
}else{
@ -333,20 +331,18 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
}
//--------上传ftp工具---------------
// Map<String,String> saveToZyk(ZykInfo zykInfo);
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);
}
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);
//--------上传ftp工具---------------