Merge remote-tracking branch 'origin/V0.1.1_alarm' into V0.1.1_alarm

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionReformServiceImpl.java

@@ -198,10 +198,10 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
             questionExportDto.setIndex(index++);
-           /* if (isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())) {
+           if (isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())) {
                 //任务未结束并且过了整改结束日期
                 questionExportDto.setReformStatusText("已逾期");
-            }*/
+            }
 
         }
         response.setContentType("application/vnd.ms-excel");

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

@@ -440,21 +440,21 @@ public class PdfUtil {
         cell1.addElement(imageTable1);
         table.addCell(cell1);
 
-        createPDFCell(tableFont, table, "联网核查结果", Element.ALIGN_MIDDLE, 1, 1);
-        final PdfPTable imageTable3 = getImage((List<String>) data.get("checkImage"), 2, 190, 190, 2);
-        final PdfPCell cell3 = new PdfPCell();
-        cell3.setNoWrap(false);
-        cell3.setPaddingLeft(4f);
-        cell3.setPaddingRight(4f);
-        cell3.setPaddingBottom(4f);
-        cell3.setPaddingTop(4f);
-        cell3.setColspan(5);
-        cell3.setRowspan(1);
-        //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
-        cell3.addElement(imageTable3);
-        table.addCell(cell3);
-
-        document.add(table);
+//        createPDFCell(tableFont, table, "联网核查结果", Element.ALIGN_MIDDLE, 1, 1);
+//        final PdfPTable imageTable3 = getImage((List<String>) data.get("checkImage"), 2, 190, 190, 2);
+//        final PdfPCell cell3 = new PdfPCell();
+//        cell3.setNoWrap(false);
+//        cell3.setPaddingLeft(4f);
+//        cell3.setPaddingRight(4f);
+//        cell3.setPaddingBottom(4f);
+//        cell3.setPaddingTop(4f);
+//        cell3.setColspan(5);
+//        cell3.setRowspan(1);
+//        //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
+//        cell3.addElement(imageTable3);
+//        table.addCell(cell3);
+//
+//        document.add(table);
 
         PdfPTable innerTable = new PdfPTable(6);
         createPDFCell(tableFont, innerTable, "介绍信附件", Element.ALIGN_MIDDLE, 1, 1);