Merge remote-tracking branch 'origin/dev_1.0.1' into dev_1.0.1

src/main/java/com/qmth/exam/reserve/service/impl/MaterialGenerateServiceImpl.java

@@ -155,7 +155,7 @@ public class MaterialGenerateServiceImpl implements MaterialGenerateService {
         }
         table.addCell(new Cell(1, 1).add("考点名称：" + title.getSiteName()).setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setBorder(null).setFontSize(fontSize).setMarginLeft(20f));
-        table.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.LEFT)
+        table.addCell(new Cell(1, 1).add("考场编号：" + title.getRoomCode()).setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setBorder(null).setFontSize(fontSize).setMarginLeft(40f));
 
         table.addCell(new Cell(1, 1).add("考场名称：" + address).setTextAlignment(TextAlignment.LEFT)
@@ -166,26 +166,26 @@ public class MaterialGenerateServiceImpl implements MaterialGenerateService {
     }
 
     private Table overviewTable(int fontSize, int totalSize) {
-        Table table = new Table(new float[]{1f, 1f, 1f, 1f}).setWidthPercent(100);
+        Table table = new Table(new float[]{1f, 1f, 1f, 0.5f, 0.5f}).setWidthPercent(100);
         table.addCell(new Cell(1, 1).add("应考人数").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
         table.addCell(new Cell(1, 1).add(String.valueOf(totalSize)).setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
-
         table.addCell(new Cell(1, 1).add("缺考人数").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(40f));
-        table.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.LEFT)
+        table.addCell(new Cell(1, 2).add(" ").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
 
         table.addCell(new Cell(1, 1).add("实考人数").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
         table.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
-
         table.addCell(new Cell(1, 1).add("监考老师签名").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(40f));
         table.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.LEFT)
                 .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
+        table.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.LEFT)
+                .setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setMarginLeft(20f));
 
         table.setMarginTop(2);
         table.setMarginBottom(2);