diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index 3992322..d025de7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -143,6 +143,10 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private Long templateDeptId; + /** 模板导出pdf纸张大小:a1-a10 */ + @TableField(exist = false) + private String templatePdfSize; + /** 试验编号 */ @TableField(exist = false) private String studySn; @@ -151,6 +155,14 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getTemplatePdfSize() { + return templatePdfSize; + } + + public void setTemplatePdfSize(String templatePdfSize) { + this.templatePdfSize = templatePdfSize; + } + public Integer getProduct() { return product; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java index c933c65..33b6087 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java @@ -58,10 +58,21 @@ public class Template extends MpBaseEntity /** 步骤库ids */ private String stepGroupIds; + /** 导出pdf纸张大小:a1-a10 */ + private String pdfSize; + /** 部门名称 */ @TableField(exist = false) private String deptName; + public String getPdfSize() { + return pdfSize; + } + + public void setPdfSize(String pdfSize) { + this.pdfSize = pdfSize; + } + public Integer getShowGc() { return showGc; } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml index 9b1c204..f8ac915 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml @@ -18,7 +18,7 @@