From f6038b34fb7c4ab2ba8216749f7957b031198dac Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 5 Jan 2026 20:59:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=EF=BC=8C=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A1=E5=88=92]=E8=BF=94=E5=9B=9E=E8=AF=95?=
 =?UTF-8?q?=E9=AA=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/business/domain/StudyFormApply.java   | 24 ++++++++++++++++++++++
 .../com/hxhq/business/domain/StudyFormFill.java    | 24 ++++++++++++++++++++++
 .../com/hxhq/business/domain/StudyFormPlan.java    | 24 ++++++++++++++++++++++
 .../com/hxhq/business/domain/StudyFormPre.java     | 24 ++++++++++++++++++++++
 .../mapper/business/StudyFormApplyMapper.xml       |  4 +++-
 .../mapper/business/StudyFormFillMapper.xml        |  2 ++
 .../mapper/business/StudyFormPlanMapper.xml        |  4 +++-
 .../mapper/business/StudyFormPreMapper.xml         |  2 ++
 8 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java
index 3451273..6ce5e6b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java
@@ -76,6 +76,30 @@ public class StudyFormApply extends MpBaseEntity
     @TableField(exist = false)
     private Long templateDeptId;
 
+    /** 试验编号 */
+    @TableField(exist = false)
+    private String studySn;
+
+    /** 试验名称 */
+    @TableField(exist = false)
+    private String studyMc;
+
+    public String getStudySn() {
+        return studySn;
+    }
+
+    public void setStudySn(String studySn) {
+        this.studySn = studySn;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public String getQmyy() {
         return qmyy;
     }
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 3fa4d8a..388f7d2 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
@@ -78,6 +78,30 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private Long templateDeptId;
 
+    /** 试验编号 */
+    @TableField(exist = false)
+    private String studySn;
+
+    /** 试验名称 */
+    @TableField(exist = false)
+    private String studyMc;
+
+    public String getStudySn() {
+        return studySn;
+    }
+
+    public void setStudySn(String studySn) {
+        this.studySn = studySn;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public Long getTemplateDeptId() {
         return templateDeptId;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java
index 63f8f45..783da4b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java
@@ -68,6 +68,30 @@ public class StudyFormPlan extends MpBaseEntity
     @TableField(exist = false)
     private String templateSn;
 
+    /** 试验编号 */
+    @TableField(exist = false)
+    private String studySn;
+
+    /** 试验名称 */
+    @TableField(exist = false)
+    private String studyMc;
+
+    public String getStudySn() {
+        return studySn;
+    }
+
+    public void setStudySn(String studySn) {
+        this.studySn = studySn;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public String getQmyy() {
         return qmyy;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java
index 26cad5c..16c933b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java
@@ -86,6 +86,30 @@ public class StudyFormPre extends MpBaseEntity
     @TableField(exist = false)
     private Long templateDeptId;
 
+    /** 试验编号 */
+    @TableField(exist = false)
+    private String studySn;
+
+    /** 试验名称 */
+    @TableField(exist = false)
+    private String studyMc;
+
+    public String getStudySn() {
+        return studySn;
+    }
+
+    public void setStudySn(String studySn) {
+        this.studySn = studySn;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public Long getTemplateDeptId() {
         return templateDeptId;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
index 0d874b2..4bde912 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
@@ -16,8 +16,10 @@
 
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormApply">
         select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_apply` t
-                 left join t_template tm on tm.id=t.template_id
+        left join t_template tm on tm.id=t.template_id
+        left join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>
\ No newline at end of file
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 93c0677..8a7b3c9 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
@@ -16,8 +16,10 @@
 
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill">
         select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_fill` t
         left join t_template tm on tm.id=t.template_id
+        left join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
index 50051f2..0e41540 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
@@ -16,8 +16,10 @@
 
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPlan">
         select t.*,tm.name as templateMc,tm.sn as templateSn
+        ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_plan` t
-                 left join t_template tm on tm.id=t.template_id
+        left join t_template tm on tm.id=t.template_id
+        left join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
index 9bb4669..4ab1c6e 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
@@ -16,8 +16,10 @@
 
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPre">
         select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_pre` t
         left join t_template tm on tm.id=t.template_id
+        left join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>
\ No newline at end of file