Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

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

@@ -79,11 +79,11 @@ public class PdfUtil {
         if (rowspan != null && rowspan > 0) {
             cell.setRowspan(rowspan);
         }
-       // cell.setPaddingTop(8f);
+        // cell.setPaddingTop(8f);
         cell.setPaddingLeft(8f);
         cell.setPaddingRight(8f);
         cell.setPaddingBottom(8f);
-        cell.setLeading(1F,1.5F);
+        cell.setLeading(1F, 1.5F);
         if (PdfPCell.ALIGN_MIDDLE != align) {
             cell.setHorizontalAlignment(align);
         } else {
@@ -182,7 +182,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, "总结", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("note").toString(), Element.ALIGN_LEFT, 5, 1);
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 30, 30);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 40, 40);
         document.add(table);
 
         //第二页
@@ -192,7 +192,7 @@ public class PdfUtil {
             PdfPTable innerTable = new PdfPTable(6);
             createPDFCell(tableFont, innerTable, "图片附件", Element.ALIGN_MIDDLE, 1, 1);
             //一行展示一张图片
-            dealEduImageCell(new ArrayList<>(stringList), innerTable, 2, 150, 200);
+            dealEduImageCell(new ArrayList<>(stringList), innerTable, 2, 185, 200);
             document.newPage();
             document.add(innerTable);
         }
@@ -366,7 +366,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 1);
         //参会人员签字
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 30, 30);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 40, 40);
         document.add(table);
 
         //第二页
@@ -375,9 +375,8 @@ public class PdfUtil {
         for (List<String> stringList : listList) {
             PdfPTable innerTable = new PdfPTable(6);
             createPDFCell(tableFont, innerTable, "图片附件", Element.ALIGN_MIDDLE, 1, 1);
-            innerTable.setSpacingBefore(10f);
             //一行展示一张图片
-            dealEduImageCell(new ArrayList<>(stringList), innerTable, 2, 150, 200);
+            dealEduImageCell(new ArrayList<>(stringList), innerTable, 2, 185, 200);
             document.newPage();
             document.add(innerTable);
         }
@@ -433,10 +432,10 @@ public class PdfUtil {
             }
             PdfPCell innerCell = new PdfPCell(imageData);
             innerCell.setNoWrap(false);
-          /*  innerCell.setPaddingTop(8f);
+            innerCell.setPaddingTop(8f);
             innerCell.setPaddingLeft(8f);
             innerCell.setPaddingRight(8f);
-            innerCell.setPaddingBottom(8f);*/
+            innerCell.setPaddingBottom(8f);
 
             innerCell.setBorder(Rectangle.NO_BORDER);
             innerCell.setHorizontalAlignment(Element.ALIGN_CENTER);