xiaofei 6 kuukautta sitten
vanhempi
commit
8cc8a1a808

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DownloadServiceImpl.java

@@ -146,7 +146,7 @@ public class DownloadServiceImpl implements DownloadService {
                             pdfFile.getParentFile().mkdirs();
                             pdfFile.createNewFile();
                         }
-                        HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, PageSizeEnum.A3);
+                        HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, "8K".equals(examCard.getPageSize()) ? PageSizeEnum.K8 : PageSizeEnum.valueOf(examCard.getPageSize()));
                         fileList.add(pdfFile);
                     }
                 }

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -465,7 +465,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             if (!pdfFile.exists()) {
                 pdfFile.createNewFile();
             }
-            HtmlToPdfUtil.convert(htmlFile.getPath(), pdfFile.getPath(), PageSizeEnum.A3);
+            HtmlToPdfUtil.convert(htmlFile.getPath(), pdfFile.getPath(), "8K".equals(examCard.getPageSize()) ? PageSizeEnum.K8 : PageSizeEnum.valueOf(examCard.getPageSize()));
 
             // jpg文件
             String jpgAttachmentIds = examCard.getJpgAttachment();

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1073,7 +1073,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                             pdfFile.getParentFile().mkdirs();
                             pdfFile.createNewFile();
                         }
-                        HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, PageSizeEnum.A3);
+                        HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, "8K".equals(examCard.getPageSize()) ? PageSizeEnum.K8 : PageSizeEnum.valueOf(examCard.getPageSize()));
                     }
                 }
             }

+ 2 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/DownloadLogicServiceImpl.java

@@ -324,7 +324,7 @@ public class DownloadLogicServiceImpl implements DownloadLogicService {
                                 file.getParentFile().mkdirs();
                                 file.createNewFile();
                             }
-                            HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, PageSizeEnum.A3);
+                            HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, "8K".equals(examCard.getPageSize()) ? PageSizeEnum.K8 : PageSizeEnum.valueOf(examCard.getPageSize()));
                             sourceFileList.add(file);
                         }
                     }
@@ -647,7 +647,7 @@ public class DownloadLogicServiceImpl implements DownloadLogicService {
                                 file.getParentFile().mkdirs();
                                 file.createNewFile();
                             }
-                            HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, PageSizeEnum.A3);
+                            HtmlToPdfUtil.convert(cardHtmlPath, cardPdfPath, "8K".equals(examCard.getPageSize()) ? PageSizeEnum.K8 : PageSizeEnum.valueOf(examCard.getPageSize()));
                         }
                         examTaskPaperExportDto.setResult("下载成功");
                     }