From 6335e32763d1dfdcdb5ecc2aceecc4fc4123f6b4 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 3 Mar 2026 15:42:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E5=89=8D=E5=BA=8F=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/business/mapper/StudyFormFillMapper.java    |  7 +++++++
 .../business/service/impl/StudyFormFillServiceImpl.java  | 16 ++++++++--------
 .../resources/mapper/business/StudyFormFillMapper.xml    | 11 +++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java
index 3bd50b7..7259c9c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java
@@ -62,4 +62,11 @@ public interface StudyFormFillMapper extends BaseMapper<StudyFormFill>
      */
     void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl);
 
+    /**
+     * 前序表单列表
+     * @param queryWrapper
+     * @return
+     */
+    List<StudyFormFill> queryQxbdList(@Param("ew") Wrapper<StudyFormFill> queryWrapper);
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
index f6a3ff8..9a36f4c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
@@ -84,18 +84,18 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     @Override
     public List<StudyFormFill> queryQxList(StudyFormFill form) {
         QueryWrapper<StudyFormFill> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("study_id",form.getStudyId());
-        queryWrapper.and(q->q.eq("bdzt",StudyFormFillBdztEnum.ywc.getValue())
-        .or().eq("bdzt",StudyFormFillBdztEnum.ywcfh.getValue()));
+        queryWrapper.eq("f.del_flag","0");
+        queryWrapper.eq("f.study_id",form.getStudyId());
+        queryWrapper.and(q->q.eq("f.bdzt",StudyFormFillBdztEnum.ywc.getValue())
+        .or().eq("f.bdzt",StudyFormFillBdztEnum.ywcfh.getValue()));
         if(StringUtils.isNoneBlank(form.getUserMc())){
-            queryWrapper.like("user_mc",form.getUserMc());
+            queryWrapper.like("f.user_mc",form.getUserMc());
         }
         if(StringUtils.isNoneBlank(form.getBdmc())){
-            queryWrapper.like("bdmc",form.getBdmc());
+            queryWrapper.like("f.bdmc",form.getBdmc());
         }
-        queryWrapper.select("id,bdbh,bdmc,user_mc,create_time,bdzt,bdnr");
-        queryWrapper.orderByDesc("id");
-        return list(queryWrapper);
+        queryWrapper.orderByDesc("f.id");
+        return baseMapper.queryQxbdList(queryWrapper);
     }
 
     /**
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 c46f24e..682377c 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
@@ -42,5 +42,16 @@
         update  t_study_form_fill set zdgxjl=#{zdgxjl}  where id=#{id};
     </update>
 
+    <select id="queryQxbdList" resultType="com.hxhq.business.domain.StudyFormFill">
+        SELECT f.id,f.bdbh,f.bdmc,f.user_mc,f.create_time,f.bdzt,f.bdnr,t.`sn` AS templateSn
+        FROM `t_study_form_fill` f JOIN `t_template` t ON f.`template_id`=t.`id`
+
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+
 
 </mapper>
\ No newline at end of file