Compare commits
No commits in common. "067d9ebf3f1eb694b2b447c10d03f0ce99a21f72" and "3a71b562e68b14c687f15008cf3aea40c460f365" have entirely different histories.
067d9ebf3f
...
3a71b562e6
|
|
@ -350,8 +350,6 @@ public class ArchivesQueryExe {
|
||||||
byteArrayList.add(execteExamRecord(params));
|
byteArrayList.add(execteExamRecord(params));
|
||||||
System.out.println("5-------------------------------------------------------------");
|
System.out.println("5-------------------------------------------------------------");
|
||||||
}
|
}
|
||||||
log.info("execteGeneratePdfList,开始转换pdf{}", JSONUtil.toJsonStr(byteArrayList));
|
|
||||||
|
|
||||||
byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList);
|
byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList);
|
||||||
Files.write(Paths.get(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"), pdf);
|
Files.write(Paths.get(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"), pdf);
|
||||||
stringList.add(new File(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"));
|
stringList.add(new File(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"));
|
||||||
|
|
@ -382,8 +380,6 @@ public class ArchivesQueryExe {
|
||||||
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
||||||
return outputStream.toByteArray();
|
return outputStream.toByteArray();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("execteHomepage,整理数据失败",e);
|
|
||||||
|
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -395,7 +391,6 @@ public class ArchivesQueryExe {
|
||||||
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
||||||
return outputStream.toByteArray();
|
return outputStream.toByteArray();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("execteAttendanceRecord,整理数据失败",e);
|
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -409,7 +404,6 @@ public class ArchivesQueryExe {
|
||||||
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
||||||
return outputStream.toByteArray();
|
return outputStream.toByteArray();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("execteStudentRecord,整理数据失败",e);
|
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -456,7 +450,6 @@ public class ArchivesQueryExe {
|
||||||
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem);
|
||||||
return outputStream.toByteArray();
|
return outputStream.toByteArray();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("execteStudyRecord,整理数据失败",e);
|
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -505,7 +498,6 @@ public class ArchivesQueryExe {
|
||||||
return outputStream.toByteArray();
|
return outputStream.toByteArray();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
log.error("execteExamRecord,整理数据失败",e);
|
|
||||||
return null;
|
return null;
|
||||||
// throw new BizException("导出失败");
|
// throw new BizException("导出失败");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue