登记簿变更

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/CheckDataVo.java

@@ -15,6 +15,7 @@ public class CheckDataVo {
     private Long itemId;
 
     private String pointName;
+    private String rectificationDeadline;
 
     private int pointNum;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -729,6 +729,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             v.setItemName(vo.getItemName());
             v.setPointName(vo.getPointName());
             v.setResRemark(vo.getRemark());
+            v.setRectificationDeadline(vo.getRectificationDeadline());
             pointCheckDataList.add(v);
         }
 

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

@@ -293,10 +293,10 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final Font tableFont = pdfTableVo.getTableFont();
         Font font = new Font(fs, 9, Font.NORMAL);
 
-        PdfUtil.dealHeader(document, fs, data.getTaskTitle(), 14);
+        PdfUtil.dealHeader(document, fs, data.getTaskTitle()+"情况表", 14);
         //日期
         String orgName = "被查支行: " + data.getOrgName();
-        String checkUser = "检查人签名: " + data.getCheckUserInfo();
+        String checkUser = "检查人: " + data.getCheckUserInfo();
         String dateStr = data.getDateStr();
         PdfPCell orgCell = new PdfPCell(new Phrase(orgName, font));
         orgCell.setColspan(16);

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

@@ -426,16 +426,18 @@ public class PdfUtil {
     public static void dealSafeCheckPBody(Document document, PdfPTable table, Font tableFont, Font tableTitleFont, List<CheckDataVo> data) throws DocumentException {
         PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 2, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "检查内容", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "主要指标描述情况", Element.ALIGN_MIDDLE, 19, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "主要指标描述情况", Element.ALIGN_MIDDLE, 17, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "检查情况", Element.ALIGN_MIDDLE, 5, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "存在的问题及整改意见", Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "整改期限", Element.ALIGN_MIDDLE, 2, 0);
 //        List<Object> dataList = (List<Object>) data.get("content");
         for (int i = 1; i <= data.size(); i++) {
             PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getItemName(), Element.ALIGN_LEFT, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getPointName(), Element.ALIGN_LEFT, 19, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getPointName(), Element.ALIGN_LEFT, 17, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, StringUtils.isEmpty(data.get(i - 1).getResRemark()) ? "√" : "×", Element.ALIGN_MIDDLE, 5, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, StringUtils.isEmpty(data.get(i - 1).getResRemark()) ? "" : data.get(i - 1).getResRemark(), Element.ALIGN_LEFT, 15, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getRectificationDeadline(), Element.ALIGN_MIDDLE, 2, 0, 25);
         }
         document.add(table);
     }