feat：[试验管理][稽查轨迹]

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

@@ -3,11 +3,15 @@ package com.hxhq.business.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.hxhq.business.domain.StudyFormFillQmxx;
+import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.form.study.StudyFormFillSearchForm;
+import com.hxhq.business.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import com.hxhq.business.domain.StudyFormFill;
-import com.hxhq.business.service.IStudyFormFillService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
@@ -25,34 +29,42 @@ public class StudyFormFillController extends BaseController
 {
     @Autowired
     private IStudyFormFillService studyFormFillService;
+    @Autowired
+    private IStudyFormFillJcgjService studyFormFillJcgjService;
+    @Autowired
+    private IStudyFormFillQmxxService studyFormFillQmxxService;
 
     /**
-     * 查询试验-填报单列表
+     * 列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(StudyFormFill studyFormFill)
+    public TableDataInfo list(StudyFormFillSearchForm form)
     {
         startPage();
-        List<StudyFormFill> list = studyFormFillService.queryList(studyFormFill);
+        List<StudyFormFillListDto> list = studyFormFillService.queryList(form);
         return getDataTable(list);
     }
 
     /**
-     * 获取试验-填报单详细信息
+     * 稽查轨迹列表
      */
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(Long id)
+    @GetMapping("/jcgjList")
+    public TableDataInfo jcgjList(StudyFormFillJcgj form)
     {
-        return AjaxResult.success(studyFormFillService.getById(id));
+        startPage();
+        List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
+        return getDataTable(list);
     }
 
     /**
-     * 新增试验-填报单信息
+     * 签名信息列表
      */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody StudyFormFill studyFormFill)
+    @GetMapping("/qmxxList")
+    public TableDataInfo qmxxList(StudyFormFillQmxx form)
     {
-        return toAjax(studyFormFillService.saveOrUpdate(studyFormFill));
+        startPage();
+        List<StudyFormFillQmxx> list = studyFormFillQmxxService.queryList(form);
+        return getDataTable(list);
     }
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -22,6 +22,9 @@ public class StudyFormFill extends MpBaseEntity
     /** 所属试验id */
     private Long studyId;
 
+    /** 所属试验学科id */
+    private Long studySubjectId;
+
     /** 表单编号 */
     private String bdbh;
 
@@ -57,6 +60,14 @@ public class StudyFormFill extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tjsj;
 
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+
     public Date getTjsj() {
         return tjsj;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java

@@ -0,0 +1,110 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验-填报单-稽查轨迹对象 t_study_form_fill_jcgj
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+@TableName("t_study_form_fill_jcgj")
+public class StudyFormFillJcgj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 填报表单id */
+    private Long formId;
+
+    /** 稽查轨迹类型:1:流程；3：编辑 */
+    private Integer jcgjlx;
+
+    /** 稽查名称 */
+    private String jcmc;
+
+    /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */
+    private Integer jcmcys;
+
+    /** 稽查内容 */
+    private String jcnr;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人名称 */
+    private String qmrMc;
+
+
+    public void setFormId(Long formId)
+    {
+        this.formId = formId;
+    }
+
+    public Long getFormId()
+    {
+        return formId;
+    }
+
+    public void setJcgjlx(Integer jcgjlx)
+    {
+        this.jcgjlx = jcgjlx;
+    }
+
+    public Integer getJcgjlx()
+    {
+        return jcgjlx;
+    }
+
+    public void setJcmc(String jcmc)
+    {
+        this.jcmc = jcmc;
+    }
+
+    public String getJcmc()
+    {
+        return jcmc;
+    }
+
+    public void setJcmcys(Integer jcmcys)
+    {
+        this.jcmcys = jcmcys;
+    }
+
+    public Integer getJcmcys()
+    {
+        return jcmcys;
+    }
+
+    public void setJcnr(String jcnr)
+    {
+        this.jcnr = jcnr;
+    }
+
+    public String getJcnr()
+    {
+        return jcnr;
+    }
+
+    public void setQmrId(Long qmrId)
+    {
+        this.qmrId = qmrId;
+    }
+
+    public Long getQmrId()
+    {
+        return qmrId;
+    }
+
+    public void setQmrMc(String qmrMc)
+    {
+        this.qmrMc = qmrMc;
+    }
+
+    public String getQmrMc()
+    {
+        return qmrMc;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillQmxx.java

@@ -0,0 +1,71 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验-填报单-签名信息对象 t_study_form_fill_qmxx
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+@TableName("t_study_form_fill_qmxx")
+public class StudyFormFillQmxx extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 填报表单id */
+    private Long formId;
+
+    /** 签名意义 */
+    private String qmyy;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人名称 */
+    private String qmrMc;
+
+
+    public void setFormId(Long formId)
+    {
+        this.formId = formId;
+    }
+
+    public Long getFormId()
+    {
+        return formId;
+    }
+
+    public void setQmyy(String qmyy)
+    {
+        this.qmyy = qmyy;
+    }
+
+    public String getQmyy()
+    {
+        return qmyy;
+    }
+
+    public void setQmrId(Long qmrId)
+    {
+        this.qmrId = qmrId;
+    }
+
+    public Long getQmrId()
+    {
+        return qmrId;
+    }
+
+    public void setQmrMc(String qmrMc)
+    {
+        this.qmrMc = qmrMc;
+    }
+
+    public String getQmrMc()
+    {
+        return qmrMc;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java

@@ -22,6 +22,9 @@ public class StudyFormPre extends MpBaseEntity
     /** 所属试验id */
     private Long studyId;
 
+    /** 所属试验学科id */
+    private Long studySubjectId;
+
     /** 表单编号 */
     private String bdbh;
 
@@ -69,6 +72,14 @@ public class StudyFormPre extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tjsj;
 
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+
     public Integer getTbzt() {
         return tbzt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillListDto.java

@@ -0,0 +1,11 @@
+package com.hxhq.business.dto.study;
+
+
+import com.hxhq.business.domain.StudyFormFill;
+
+/**
+ * @author tanfei
+ */
+public class StudyFormFillListDto extends StudyFormFill {
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSearchForm.java

@@ -7,6 +7,9 @@ public class StudyFormFillSearchForm {
     /** 所属试验id */
     private Long studyId;
 
+    /** 所属试验学科id */
+    private Long studySubjectId;
+
     /** 表单编号 */
     private String bdbh;
 
@@ -34,6 +37,14 @@ public class StudyFormFillSearchForm {
     /** 创建时间开始 */
     private String cjsjjs;
 
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+
     public Long getStudyId() {
         return studyId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormPreSearchForm.java

@@ -9,6 +9,9 @@ public class StudyFormPreSearchForm {
     /** 所属试验id */
     private Long studyId;
 
+    /** 所属试验学科id */
+    private Long studySubjectId;
+
     /** 表单编号 */
     private String bdbh;
 
@@ -27,6 +30,14 @@ public class StudyFormPreSearchForm {
     /** 创建时间开始 */
     private String endDate;
 
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+
     public Long getStudyId() {
         return studyId;
     }

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-填报单-稽查轨迹Mapper接口
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+public interface StudyFormFillJcgjMapper extends BaseMapper<StudyFormFillJcgj>
+{
+
+}

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

@@ -1,7 +1,15 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.StudyFormFill;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.StudyFormPre;
+import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.dto.study.StudyFormPreListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 试验-填报单Mapper接口
  *
@@ -10,5 +18,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StudyFormFillMapper extends BaseMapper<StudyFormFill>
 {
-
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<StudyFormFillListDto> queryList(@Param("ew") Wrapper<StudyFormFill> queryWrapper);
 }

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyFormFillQmxx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-填报单-签名信息Mapper接口
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+public interface StudyFormFillQmxxMapper extends BaseMapper<StudyFormFillQmxx>
+{
+
+}

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

@@ -0,0 +1,35 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.domain.StudyFormPreJcgj;
+
+/**
+ * 试验-填报单-稽查轨迹Service接口
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+public interface IStudyFormFillJcgjService extends IService<StudyFormFillJcgj>
+{
+
+    /**
+     * 轨迹列表
+     * @param studyFormFillJcgj
+     * @return
+     */
+    public List<StudyFormFillJcgj> queryList(StudyFormFillJcgj studyFormFillJcgj);
+
+    /**
+     * 新增稽查轨迹
+     * @param formId 记录id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param jcrId 稽查人id
+     * @param jcrMc 稽查人名称
+     */
+    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc);
+}

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

@@ -0,0 +1,34 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyFormFillQmxx;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.domain.StudyFormPreQmxx;
+
+/**
+ * 试验-填报单-签名信息Service接口
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+public interface IStudyFormFillQmxxService extends IService<StudyFormFillQmxx>
+{
+
+    /**
+     * 查询试验-填报单-签名信息列表
+     *
+     * @param studyFormFillQmxx
+     * @return 试验-填报单-签名信息集合
+     */
+    public List<StudyFormFillQmxx> queryList(StudyFormFillQmxx studyFormFillQmxx);
+
+    /**
+     * 新增签名信息
+     * @param formId
+     * @param qmyy
+     * @param qmrId
+     * @param qmrMc
+     * @param remark
+     */
+    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc,String remark);
+}

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

@@ -3,6 +3,8 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.StudyFormFill;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.form.study.StudyFormFillSearchForm;
 
 /**
  * 试验-填报单Service接口
@@ -15,9 +17,9 @@ public interface IStudyFormFillService extends IService
     /**
      * 查询试验-填报单列表
      *
-     * @param studyFormFill 试验-填报单
+     * @param form 试验-填报单
      * @return 试验-填报单集合
      */
-    public List<StudyFormFill> queryList(StudyFormFill studyFormFill);
+    public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form);
 
 }

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

@@ -52,7 +52,7 @@ public interface IStudyFormPreService extends IService
 
     /**
      * 填报
-     * @param form
+     * @param studyFormPre
      */
     public void tb(StudyFormPre studyFormPre);
 

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

@@ -0,0 +1,72 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormPreJcgj;
+import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.core.utils.DateUtils;
+import com.hxhq.common.core.utils.StringUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudyFormFillJcgjMapper;
+import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.hxhq.business.service.IStudyFormFillJcgjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-填报单-稽查轨迹Service业务层处理
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+@Service
+public class StudyFormFillJcgjServiceImpl extends ServiceImpl<StudyFormFillJcgjMapper, StudyFormFillJcgj> implements IStudyFormFillJcgjService
+{
+
+    /**
+     * 查询稽查轨迹列表
+     * @param studyFormFillJcgj
+     * @return
+     */
+    @Override
+    public List<StudyFormFillJcgj> queryList(StudyFormFillJcgj studyFormFillJcgj){
+        QueryWrapper<StudyFormFillJcgj> queryWrapper = Wrappers.query();
+        if(studyFormFillJcgj.getFormId()==null||studyFormFillJcgj.getFormId().longValue()<0){
+            throw new ServiceException("表单id不能为空");
+        }
+        queryWrapper.eq("form_id",studyFormFillJcgj.getFormId());
+        if(studyFormFillJcgj.getJcgjlx()!=null&&studyFormFillJcgj.getJcgjlx().intValue()>0){
+            queryWrapper.eq("jcgjlx",studyFormFillJcgj.getJcgjlx());
+        }
+        if (StringUtils.isNoneBlank(studyFormFillJcgj.getJcmc())) {
+            queryWrapper.and(p -> p.like("`jcmc`", studyFormFillJcgj.getJcmc())
+                    .or().like("`jcnr`", studyFormFillJcgj.getJcmc()));
+        }
+        queryWrapper.orderByDesc("id");
+        return this.list(queryWrapper);
+    }
+
+    /**
+     * 新增稽查轨迹
+     * @param formId
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param jcrId 稽查人id
+     * @param jcrMc 稽查人名称
+     */
+    @Override
+    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){
+        StudyFormFillJcgj studyFormFillJcgj = new StudyFormFillJcgj();
+        studyFormFillJcgj.setFormId(formId);
+        studyFormFillJcgj.setJcgjlx(jcgjlx);
+        studyFormFillJcgj.setJcmc(jcmc);
+        studyFormFillJcgj.setJcmcys(jcmcys);
+        studyFormFillJcgj.setJcnr(jcnr);
+        studyFormFillJcgj.setQmrId(jcrId);
+        studyFormFillJcgj.setQmrMc(jcrMc);
+        this.save(studyFormFillJcgj);
+    }
+
+}

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

@@ -0,0 +1,62 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormPreQmxx;
+import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudyFormFillQmxxMapper;
+import com.hxhq.business.domain.StudyFormFillQmxx;
+import com.hxhq.business.service.IStudyFormFillQmxxService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-填报单-签名信息Service业务层处理
+ *
+ * @author hxhq
+ * @date 2025-12-31
+ */
+@Service
+public class StudyFormFillQmxxServiceImpl extends ServiceImpl<StudyFormFillQmxxMapper, StudyFormFillQmxx> implements IStudyFormFillQmxxService
+{
+
+    /**
+     * 查询试验-填报单-签名信息列表
+     *
+     * @param studyFormFillQmxx 试验-填报单-签名信息
+     * @return 试验-填报单-签名信息
+     */
+    @Override
+    public List<StudyFormFillQmxx> queryList(StudyFormFillQmxx studyFormFillQmxx)
+    {
+        QueryWrapper<StudyFormFillQmxx> queryWrapper = Wrappers.query();
+        if(studyFormFillQmxx.getFormId()==null||studyFormFillQmxx.getFormId().longValue()<0){
+            throw new ServiceException("表单id不能为空");
+        }
+        queryWrapper.eq("form_id",studyFormFillQmxx.getFormId());
+        queryWrapper.orderByDesc("id");
+        return this.list(queryWrapper);
+    }
+
+    /**
+     * 新增签名信息
+     * @param formId
+     * @param qmyy
+     * @param qmrId
+     * @param qmrMc
+     * @param remark
+     */
+    @Override
+    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc,String remark){
+        StudyFormFillQmxx studyFormFillQmxx=new StudyFormFillQmxx();
+        studyFormFillQmxx.setFormId(formId);
+        studyFormFillQmxx.setQmyy(qmyy);
+        studyFormFillQmxx.setQmrId(qmrId);
+        studyFormFillQmxx.setQmrMc(qmrMc);
+        studyFormFillQmxx.setRemark(remark);
+        this.save(studyFormFillQmxx);
+    }
+
+}

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

@@ -3,6 +3,11 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormPre;
+import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.form.study.StudyFormFillSearchForm;
+import com.hxhq.business.form.study.StudyFormPreSearchForm;
+import com.hxhq.common.core.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormFillMapper;
 import com.hxhq.business.domain.StudyFormFill;
@@ -21,14 +26,43 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     /**
      * 查询试验-填报单列表
      *
-     * @param studyFormFill 试验-填报单
+     * @param form 试验-填报单
      * @return 试验-填报单
      */
     @Override
-    public List<StudyFormFill> queryList(StudyFormFill studyFormFill)
+    public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form)
     {
         QueryWrapper<StudyFormFill> queryWrapper = Wrappers.query();
-        return this.list(queryWrapper);
+        queryWrapper.eq("t.del_flag", "0");
+        if (form.getUserId() != null && form.getUserId().longValue() > 0) {
+            queryWrapper.eq("t.user_id", form.getUserId());
+        }
+        if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
+            queryWrapper.eq("t.study_id", form.getStudyId());
+        }
+        if (StringUtils.isNoneBlank(form.getBdbh())) {
+            queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh()));
+        }
+        if (StringUtils.isNoneBlank(form.getBdmc())) {
+            queryWrapper.and(p -> p.like("t.`bdmc`", form.getBdmc()));
+        }
+        if (StringUtils.isNoneBlank(form.getTemplateMc())) {
+            queryWrapper.and(p -> p.like("t.`template_mc`", form.getTemplateMc()));
+        }
+        if (StringUtils.isNoneBlank(form.getTjsjks())) {
+            queryWrapper.apply("t.tjsj>={0}", form.getTjsjks());
+        }
+        if (StringUtils.isNoneBlank(form.getTjsjjs())) {
+            queryWrapper.apply("t.tjsj<{0}", form.getTjsjjs());
+        }
+        if (StringUtils.isNoneBlank(form.getCjsjks())) {
+            queryWrapper.apply("t.create_time>={0}", form.getTjsjks());
+        }
+        if (StringUtils.isNoneBlank(form.getCjsjjs())) {
+            queryWrapper.apply("t.create_time<{0}", form.getTjsjjs());
+        }
+        queryWrapper.orderByDesc("t.create_time");
+        return baseMapper.queryList(queryWrapper);
     }
 
 }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillJcgjMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.StudyFormFillJcgjMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

@@ -3,4 +3,13 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper">
+    <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto">
+        select t.id,t.bdbh,t.bdmc,t.template_mc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,t.sfbl,t.tjsj
+        FROM `t_study_form_fill` t
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillQmxxMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.StudyFormFillQmxxMapper">
+</mapper>