计量相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/Formula.java

@@ -1,5 +1,7 @@
 package org.springblade.manager.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +34,7 @@ public class Formula extends BaseEntity {
     private Integer orderNum;
     private String remark;
     private String map;
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Integer scale;
     private Integer batch;
     /**

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2835,19 +2835,19 @@ public class TaskController extends BladeController {
                                 /*printSetup.setFitHeight((short) 1);
                                 printSetup.setFitWidth((short) 1);*/
                                 // 设置页边距，单位为厘米
-                                printSetup.setPaperSize(PrintSetup.A4_PAPERSIZE);
-
+                               // printSetup.setPaperSize(PrintSetup.A3_PAPERSIZE);
                                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                                 workbook.write(out);
                                 workbook.write(new FileOutputStream(rs.getExcelPath()));
                                 com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(new ByteArrayInputStream(out.toByteArray()));
                                 PageSetup pageSetup =wb.getWorksheets().get(0).getPageSetup();
-                                pageSetup.setLeftMargin(0.5);   // 左边距
+                               /* pageSetup.setLeftMargin(0.5);   // 左边距
                                 pageSetup.setRightMargin(0.5);  // 右边距
                                 pageSetup.setTopMargin(1.5);    // 上边距
                                 pageSetup.setBottomMargin(1.5); // 下边距*/
                                 pageSetup.setCenterHorizontally(true);
                                 pageSetup.setCenterVertically(true);
+                                pageSetup.setPaperSize(PrintSetup.A4_PAPERSIZE);
                                 out.reset();
                                 wb.save(out, SaveFormat.PDF);
                                 reader = new PdfReader(new ByteArrayInputStream(out.toByteArray()));