培训登记簿样式修改完成代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -800,20 +800,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             data.put("signImage", new ArrayList<>());
         } else {
             List<String> collect = taskUserList.stream().filter(item -> item.getType() == 1 && ObjectUtil.isNotEmpty(item.getSignImage())).map(CoreEduTrainingTaskToUser::getSignImage).collect(Collectors.toList());
-            final String str = collect.get(0);
-            for (int i = 0; i < 11; i++) {
-                collect.add(str);
-            }
             data.put("signImage", getFileRealPath(collect, prefixPath, staticsPath));
-        }//
+        }
         if (ObjectUtil.isEmpty(task.getImageList())) {
             data.put("fileImage", new ArrayList<>());
         } else {
             final List<String> collect = Arrays.stream(task.getImageList().split(",")).collect(Collectors.toList());
-            final String str = collect.get(0);
-            for (int i = 0; i < 7; i++) {
-                collect.add(str);
-            }
             data.put("fileImage", getFileRealPath(collect, prefixPath, staticsPath));
         }
         return data;

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfPageHelperEvent.java

@@ -34,13 +34,11 @@ public class PdfPageHelperEvent implements PdfPageEvent {
 
     @Override
     public void onStartPage(PdfWriter pdfWriter, Document document) {
-        try {
+       /* try {
             PdfUtil.createWatermark(document,pdfWriter,tableFont,"水印测试");
-        } catch (DocumentException e) {
+        } catch (DocumentException | IOException e) {
             throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        }*/
     }
 
     @Override

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -188,7 +188,7 @@ public class PdfUtil {
             createPDFCell(tableFont, innerTable, "图片附件", Element.ALIGN_MIDDLE, 1, 1);
             innerTable.setSpacingBefore(10f);
             //一行展示一张图片
-            dealEduImageCell(stringList, innerTable, 2, 150, 200);
+            dealEduImageCell(new ArrayList<>(stringList), innerTable, 2, 150, 200);
             document.newPage();
             document.add(innerTable);
         }