演练登记簿样式修改代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -794,7 +794,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         } else {
             List<String> collect = taskUserList.stream().filter(item -> item.getType() == 1 && ObjectUtil.isNotEmpty(item.getSignImage())).map(CoreDrillTaskToUser::getSignImage).collect(Collectors.toList());
             /*final String str = collect.get(0);
-            for (int i = 0; i < 6; i++) {
+            for (int i = 0; i < 10; i++) {
                 collect.add(str);
             }*/
             data.put("signImage", getFileRealPath(collect, prefixPath, staticsPath));

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -389,8 +389,6 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         document.open();
         PdfUtil.dealHeader(document, fs, "预 案 演 练 记 录", 24);
         PdfUtil.dealDrillBody(document, table, tableFont, data);
-
-
         document.close();
         writer.close();
         log.info("预案演练登记簿生成结束，当前绝对地址为：{}", afterStr);

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

@@ -1,10 +1,7 @@
 package com.xunmei.file.utils;
 
 import com.lowagie.text.*;
-import com.lowagie.text.pdf.BaseFont;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfPageEvent;
-import com.lowagie.text.pdf.PdfWriter;
+import com.lowagie.text.pdf.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -51,7 +48,7 @@ public class PdfPageHelperEvent implements PdfPageEvent {
                 cb.showTextAligned(PdfContentByte.ALIGN_LEFT, "H-Left", document.left(), x, 0); // 中
                 cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "第" + writer.getCurrentPageNumber() + "页", (document.right() + document.left()) / 2, x, 0); // 右
                 cb.showTextAligned(PdfContentByte.ALIGN_RIGHT, "H-Right", document.right(), x, 0); */
-        float y = document.bottom(10); // 左
+        float y = document.bottom(-80); // 左
         cb.showTextAligned(PdfContentByte.ALIGN_LEFT, "", document.left(), y, 0); // 中
         cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "第" + writer.getCurrentPageNumber() + "页/共" + totalPageSize + "页", (document.right() + document.left()) / 2, y, 0); // 右
         cb.showTextAligned(PdfContentByte.ALIGN_RIGHT, "", document.right(), y, 0);

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

@@ -29,7 +29,7 @@ public class PdfUtil {
 
 
     public static ItextPdfTableVo createTable(String filename, int numColumns, int fontSize) throws Exception {
-        Document document = new Document(PageSize.A4, 0, 0, 50, 0);//SUPPRESS
+        Document document = new Document(PageSize.A4, 0, 0, 50, 100);//SUPPRESS
         File file = FileUtils.getFile(filename);
         FileOutputStream fos = new FileOutputStream(file);
         String afterStr_1 = StringEscapeUtils.escapeEcmaScript(filename);
@@ -45,8 +45,8 @@ public class PdfUtil {
         // 设置各列列宽
         // table.setTotalWidth(new float[]{90, 100, 100, 120, 100, 100});
         table.setSpacingBefore(16f);
-        table.setSplitRows(false);
-        table.setSplitLate(true);
+        table.setSplitRows(true);
+        table.setSplitLate(false);
         ItextPdfTableVo itextPdfTableVo = new ItextPdfTableVo();
         itextPdfTableVo.setDocument(document);
         itextPdfTableVo.setWriter(writer);
@@ -341,16 +341,16 @@ public class PdfUtil {
         createPDFCell(tableFont, table, "演练项目", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_LEFT, 5, 1);
         //预设案由
-        createPDFCell(tableFont, table, "预设案由", Element.ALIGN_MIDDLE, 1, 140);
-        createPDFCell(tableFont, table, data.get("presetCase").toString(), Element.ALIGN_LEFT, 5, 140);
+        createPDFCell(tableFont, table, "预设案由", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, data.get("presetCase").toString(), Element.ALIGN_LEFT, 5, 1);
         //演练情况
-        createPDFCell(tableFont, table, "演练情况", Element.ALIGN_MIDDLE, 1, 140);
-        createPDFCell(tableFont, table, data.get("drillSituation").toString(), Element.ALIGN_LEFT, 5, 140);
+        createPDFCell(tableFont, table, "演练情况", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, data.get("drillSituation").toString(), Element.ALIGN_LEFT, 5, 1);
         //点评总结
-        createPDFCell(tableFont, table, "点评总结", Element.ALIGN_MIDDLE, 1, 140);
-        createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 140);
+        createPDFCell(tableFont, table, "点评总结", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 1);
         //参会人员签字
-        createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 140);
+        createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
         dealEduImageCell((List<String>) data.get("signImage"), table, 5, 30, 30);
         document.add(table);
 
@@ -408,8 +408,8 @@ public class PdfUtil {
             }
         }
         PdfPTable imageInnerTable = new PdfPTable(imageNumsOfRow);
-        imageInnerTable.setSplitRows(false);
-        imageInnerTable.setSplitLate(true);
+        imageInnerTable.setSplitRows(true);
+        imageInnerTable.setSplitLate(false);
         for (String image : imageList) {
             Image imageData = convertFileToByteArray(new File(image));
             if (imageData != null) {
@@ -427,8 +427,6 @@ public class PdfUtil {
             imageInnerTable.addCell(innerCell);
         }
         outCell.addElement(imageInnerTable);
-        table.setSplitRows(false);
-        table.setSplitLate(true);
         table.addCell(outCell);
     }
 
@@ -438,8 +436,8 @@ public class PdfUtil {
             images = new ArrayList<>();
         }
         PdfPTable innerTable = new PdfPTable(ImageNumsOfRow);
-        innerTable.setSplitRows(false);
-        innerTable.setSplitLate(true);
+        innerTable.setSplitRows(true);
+        innerTable.setSplitLate(false);
         //这里根据实际图片数量来判断是否需要补充白色图片,保证每行显示3张图片,用以填充空白
         final int reallySize = images.size();
         List<String> list = new ArrayList<>(images);
@@ -471,8 +469,8 @@ public class PdfUtil {
         PdfPTable outerTable = new PdfPTable(1);
         PdfPCell innerCell = new PdfPCell(innerTable);
         innerCell.setBorder(Rectangle.NO_BORDER);
-        outerTable.setSplitRows(false);
-        outerTable.setSplitLate(true);
+        outerTable.setSplitRows(true);
+        outerTable.setSplitLate(false);
         outerTable.addCell(innerCell);
         return outerTable;
     }