ws 1 tahun lalu
induk
melakukan
e995a885df

+ 5 - 5
PrintServer/src/main/java/com/jd/printserver/utils/xlsToPdfUtil.java

@@ -39,10 +39,10 @@ public class xlsToPdfUtil {
             //页面大小  A3是8,A4是9,A5是11等等
             pageSetup.setPaperSize(paperSize.getValue());
             // 页边距
-            pageSetup.setLeftMargin(0);
-            pageSetup.setRightMargin(0);
-            pageSetup.setTopMargin(1);
-            pageSetup.setBottomMargin(0);
+            pageSetup.setLeftMargin(printParam.getMarginLeft()/10d);
+            pageSetup.setRightMargin(printParam.getMarginRight()/10d);
+            pageSetup.setTopMargin(1 + (printParam.getMarginTop()/10d));
+            pageSetup.setBottomMargin(printParam.getMarginBottom()/10d);
             //打印方向 0 自动 1 横向 2 纵向
             if(orientation == 1) {
                 //设置横向打印2还是纵向打印1
@@ -74,7 +74,7 @@ public class xlsToPdfUtil {
             for (PDPage page : document.getPages()) {
                 // 创建新的裁剪框
                 PDRectangle mediaBox = page.getMediaBox();
-                PDRectangle cropBox = new PDRectangle(0, 0, mediaBox.getWidth(), mediaBox.getHeight() - 28f);
+                PDRectangle cropBox = new PDRectangle(0, 0, mediaBox.getWidth(), mediaBox.getHeight() - printParam.mm2px(10));
 
                 // 设置页面的裁剪框
                 page.setCropBox(cropBox);