3.2.0-bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePrintPdfUtil.java

@@ -243,11 +243,12 @@ public class CreatePrintPdfUtil {
             document.add(blank);
 
             // 基础信息表格
-            PdfPTable basicTable = PdfFillUtils.createTable(new float[]{20, 80});
+            PdfPTable basicTable = PdfFillUtils.createTable(new float[]{20, 3, 77});
             List<Map<String, String>> basicPlate = pdfPackageDto.getBasicPlate();
             for (Map<String, String> stringMap : basicPlate) {
                 basicTable.addCell(PdfFillUtils.createCell(stringMap.get("name"), PdfFillUtils.textFont24, 50f, Element.ALIGN_JUSTIFIED_ALL, 0f));
-                basicTable.addCell(PdfFillUtils.createCell(": " + stringMap.get("value"), PdfFillUtils.textFont24, 50f, Element.ALIGN_LEFT, 0f));
+                basicTable.addCell(PdfFillUtils.createCell(": ", PdfFillUtils.textFont24, 50f, Element.ALIGN_JUSTIFIED_ALL, 0f));
+                basicTable.addCell(PdfFillUtils.createCell(stringMap.get("value"), PdfFillUtils.textFont24, 50f, Element.ALIGN_LEFT, 0f));
             }
             document.add(basicTable);
             document.add(blank);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfFillUtils.java

@@ -214,14 +214,13 @@ public class PdfFillUtils {
         cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
         cell.setHorizontalAlignment(horizontalAlignment);
         cell.setUseAscender(true);
+        cell.setPaddingTop(10f);
+        cell.setPaddingBottom(10f);
         if (font != null) {
             cell.setPhrase(new Phrase(value, font));
         } else {
             cell.setPhrase(new Phrase(value));
         }
-        if (fixedHeight > 0) {
-            cell.setFixedHeight(fixedHeight);
-        }
         cell.disableBorderSide(15);
         if (paddingLeft > 0) {
             cell.setPaddingLeft(paddingLeft);

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -111,7 +111,7 @@
     </select>
     <select id="listGenericCard" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT
-            distinct a.id, a.title, a.type, a.create_method createMethod
+            distinct a.id, a.title, a.type, a.make_method makeMethod, a.create_method createMethod
         FROM
             exam_card a
         WHERE
@@ -125,7 +125,7 @@
     </select>
     <select id="listCustom" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT
-            a.id, a.title, a.type, a.create_id createId, a.create_method createMethod
+            a.id, a.title, a.type, a.create_id createId, a.make_method makeMethod, a.create_method createMethod
         FROM
             exam_card a
         WHERE