zcloud_gbs
/
zcloud_gbs_edu
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:130e436c69ab1376584a2b06764536c31efbf5a8
Branches Tags
zcloud_gbs:dev
zcloud_gbs:main
..
compare: zcloud_gbs:c8372661654130a07d2326e0366442d8f92d431f
Branches Tags
zcloud_gbs:dev
zcloud_gbs:main

No commits in common. "130e436c69ab1376584a2b06764536c31efbf5a8" and "c8372661654130a07d2326e0366442d8f92d431f" have entirely different histories.
130e436c69 ... c837266165

2 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java
View File

@ -350,6 +350,7 @@ 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);
@ -461,9 +462,6 @@ public class ArchivesQueryExe {
} }
public byte[] execteExamRecord(PersonArchivesDTO params){ public byte[] execteExamRecord(PersonArchivesDTO params){
try { try {
if(params.getStudentExamRecord() == null){
return null;
}
Map<String, Object> workItem = BeanUtil.beanToMap(params.getStudentExamRecord()); Map<String, Object> workItem = BeanUtil.beanToMap(params.getStudentExamRecord());
ArrayList<Object> workList = CollUtil.newArrayList(); ArrayList<Object> workList = CollUtil.newArrayList();
AtomicInteger atomicIndex = new AtomicInteger(1); AtomicInteger atomicIndex = new AtomicInteger(1);

1
web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java
View File

@ -61,6 +61,7 @@ public class ArchivesServiceImpl implements ArchivesServiceI {
@Override @Override
public void downloadPersonArchivesList(ArchivesQry qry) { public void downloadPersonArchivesList(ArchivesQry qry) {
List<PersonArchivesDTO> personArchivesDTOList = archivesQueryExe.downloadPersonArchivesList(qry); List<PersonArchivesDTO> personArchivesDTOList = archivesQueryExe.downloadPersonArchivesList(qry);
log.info("downloadPersonArchivesList,开始一人一档异步下载{}", JSONUtil.toJsonStr(personArchivesDTOList));
archivesQueryExe.execteGeneratePdfList(qry,personArchivesDTOList); archivesQueryExe.execteGeneratePdfList(qry,personArchivesDTOList);
} }