feat: [模板管理] 前序表单增加模板编号

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java

@@ -62,4 +62,11 @@ public interface StudyFormFillMapper extends BaseMapper
      */
     void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl);
 
+    /**
+     * 前序表单列表
+     * @param queryWrapper
+     * @return
+     */
+    List<StudyFormFill> queryQxbdList(@Param("ew") Wrapper<StudyFormFill> queryWrapper);
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -84,18 +84,18 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @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);
     }
 
     /**

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>