Commit 456fcd2a authored by 盖献康's avatar 盖献康

Merge branch 'gaixiankang' into 'dev'

bug - 70845

See merge request !251
parents d3535aa8 47279a0c
...@@ -229,13 +229,15 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe ...@@ -229,13 +229,15 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
// 查询数据 // 查询数据
List<ReviewEnterpriseArchiveViewVO> viewList = reviewEnterpriseArchiveService.view(taskId); List<ReviewEnterpriseArchiveViewVO> viewList = reviewEnterpriseArchiveService.view(taskId);
for (ReviewEnterpriseArchiveViewVO view : viewList) { for (ReviewEnterpriseArchiveViewVO view : viewList) {
document.writeCell(view.getFileName(), Element.ALIGN_LEFT, 1, view.getItems().size(), table); if (view.getItems().size() > 0) {
view.getItems().forEach(item -> { document.writeCell(view.getFileName(), Element.ALIGN_LEFT, 1, view.getItems().size(), table);
document.writeCell(item.getCatalogue(), Element.ALIGN_LEFT, 1, 1, table); view.getItems().forEach(item -> {
document.writeCell(item.getChapter(), Element.ALIGN_LEFT, 1, 1, table); document.writeCell(item.getCatalogue(), Element.ALIGN_LEFT, 1, 1, table);
document.writeCell(item.getStandard(), Element.ALIGN_LEFT, 1, 1, table); document.writeCell(item.getChapter(), Element.ALIGN_LEFT, 1, 1, table);
document.writeCell(item.getKeyPoint(), Element.ALIGN_LEFT, 1, 1, table); document.writeCell(item.getStandard(), Element.ALIGN_LEFT, 1, 1, table);
}); document.writeCell(item.getKeyPoint(), Element.ALIGN_LEFT, 1, 1, table);
});
}
} }
document.addContent(table); document.addContent(table);
// 最后结尾签字 // 最后结尾签字
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment