From b8f6a805b49ed438895fcba9fa8cdda21d8c9769 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Sun, 1 Feb 2026 10:46:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA]=E6=96=B0=E5=A2=9Epdfsize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hxhq/business/domain/StudyFormFill.java    | 12 ++++++++++++
 .../src/main/java/com/hxhq/business/domain/Template.java     | 11 +++++++++++
 .../main/resources/mapper/business/StudyFormFillMapper.xml   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

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 @@
 
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill">
         select t.*,tm.name as templateMc,tm.name_en as templateMcEn,tm.sn as templateSn,tm.show_sn as templateShowSn,tm.dept_id as templateDeptId
-             ,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product
+             ,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product,tm.pdf_size as templatePdfSize
         FROM `t_study_form_fill` t
         join t_template tm on tm.id=t.template_id
         join t_study ts on ts.id=t.study_id