出入登记簿调整

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreOutInRecordVo.java

@@ -132,5 +132,9 @@ public class CoreOutInRecordVo{
 
     private String pdfUrl;
 
+    @ApiModelProperty(value = "登记人员")
+    private String createBy;
+
+
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -321,6 +321,11 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         } else {
             data.put("checkImage", getFileRealPath(Arrays.asList(checkImage.split(",")), prefixPath, staticsPath));
         }
+        //登记人员
+        data.put("createBy", record.getCreateBy());
+        //陪同人员人员
+        data.put("accompanyingPerson", record.getAccompanyingPerson());
+
         return data;
     }
 

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

@@ -277,11 +277,17 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("inTime").toString(), Element.ALIGN_CENTER, 2, 1);
         createPDFCell(tableFont, table, "离开时间", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("outTime").toString(), Element.ALIGN_CENTER, 2, 1);
+
+        //第六行
+        createPDFCell(tableFont, table, "陪同人员", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("accompanyingPerson").toString(), Element.ALIGN_CENTER, 2, 1);
+        createPDFCell(tableFont, table, "登记人员", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("createBy").toString(), Element.ALIGN_CENTER, 2, 1);
 //           /statics/2023/12/05/20231205183106A001.png
         //证件图片
-        createPDFCell(tableFont, table, "证件图片", Element.ALIGN_CENTER, 1, 70);
-        //演练情况 图片填充
-        final PdfPTable imageTable1 = getImage((List<String>) data.get("imageFile"), 4, 150, 130, 2);
+        createPDFCell(tableFont, table, "证件图片", Element.ALIGN_CENTER, 1, 60);
+        //证件图片 图片填充
+        final PdfPTable imageTable1 = getImage((List<String>) data.get("imageFile"), 2, 150, 150, 2);
         final PdfPCell cell1 = new PdfPCell();
         cell1.setNoWrap(false);
         cell1.setPaddingLeft(8f);
@@ -289,11 +295,11 @@ public class PdfUtil {
         cell1.setPaddingBottom(8f);
         cell1.setPaddingTop(8f);
         cell1.setColspan(5);
-        cell1.setRowspan(70);
+        cell1.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell1.addElement(imageTable1);
         table.addCell(cell1);
-        createPDFCell(tableFont, table, "介绍信附件", Element.ALIGN_CENTER, 1, 70);
+        createPDFCell(tableFont, table, "介绍信附件", Element.ALIGN_CENTER, 1, 60);
         final PdfPTable imageTable2 = getImage((List<String>) data.get("file"), 2, 150, 150, 2);
         final PdfPCell cell2 = new PdfPCell();
         cell2.setNoWrap(false);
@@ -302,11 +308,11 @@ public class PdfUtil {
         cell2.setPaddingBottom(8f);
         cell2.setPaddingTop(8f);
         cell2.setColspan(5);
-        cell2.setRowspan(70);
+        cell2.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell2.addElement(imageTable2);
         table.addCell(cell2);
-        createPDFCell(tableFont, table, "身份核验材料", Element.ALIGN_CENTER, 1, 70);
+        createPDFCell(tableFont, table, "身份核验材料", Element.ALIGN_CENTER, 1, 60);
         final PdfPTable imageTable3 = getImage((List<String>) data.get("checkImage"), 2, 150, 150, 2);
         final PdfPCell cell3 = new PdfPCell();
         cell3.setNoWrap(false);
@@ -315,7 +321,7 @@ public class PdfUtil {
         cell3.setPaddingBottom(8f);
         cell3.setPaddingTop(8f);
         cell3.setColspan(5);
-        cell3.setRowspan(70);
+        cell3.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell3.addElement(imageTable3);
         table.addCell(cell3);