feat: [模板管理] 前序表单列表

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

@@ -78,6 +78,8 @@ public class PublicController extends BaseController {
     public ISystemLogService systemLogService;
     @Autowired
     public IJcbService jcbService;
+    @Autowired
+    public IStudyFormFillService studyFormFillService;
 
 
     /**
@@ -331,4 +333,17 @@ public class PublicController extends BaseController {
         List<Jcb> list = jcbService.queryList(jcb);
         return getDataTable(list);
     }
+
+    /**
+     * 前序表单列表
+     * @param formFill
+     * @return
+     */
+    @GetMapping("/qxFormFillList")
+    public TableDataInfo qxFormFillList(StudyFormFill formFill)
+    {
+        startPage();
+        List<StudyFormFill> list = studyFormFillService.queryQxList(formFill);
+        return getDataTable(list);
+    }
 }

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

@@ -15,6 +15,13 @@ import com.hxhq.business.form.study.*;
 public interface IStudyFormFillService extends IService<StudyFormFill>
 {
     /**
+     * 前序表单列表
+     * @param form
+     * @return
+     */
+    public List<StudyFormFill> queryQxList(StudyFormFill form);
+
+    /**
      * 查询试验-填报单列表
      *
      * @param form 试验-填报单

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

@@ -81,6 +81,22 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @Autowired
     private IJcbService jcbService;
 
+    @Override
+    public List<StudyFormFill> queryQxList(StudyFormFill form) {
+        QueryWrapper<StudyFormFill> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("study_id",form.getStudyId());
+        queryWrapper.and(q->q.eq("status",StudyFormFillBdztEnum.ywc.getValue())
+        .or().eq("status",StudyFormFillBdztEnum.ywcfh.getValue()));
+        if(StringUtils.isNoneBlank(form.getUserMc())){
+            queryWrapper.like("user_mc",form.getUserMc());
+        }
+        if(StringUtils.isNoneBlank(form.getBdmc())){
+            queryWrapper.like("bdmc",form.getBdmc());
+        }
+        queryWrapper.select("id,bdmc,user_mc,create_time,bdzt");
+        queryWrapper.orderByDesc("id");
+        return list(queryWrapper);
+    }
 
     /**
      * 开始配置