feat:[试验管理][物资列表]试剂、供试品

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

@@ -1,15 +1,13 @@
 package com.hxhq.business.controller;
 
-import java.util.Arrays;
 import java.util.List;
 
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.form.gsp.*;
-import com.hxhq.business.form.mjy.*;
-import com.hxhq.business.form.sj.*;
+import com.hxhq.business.form.gyzj.SearchForm;
 import com.hxhq.business.service.IGspJcgjService;
 import com.hxhq.business.service.IGspTzService;
-import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -39,10 +37,21 @@ public class GspController extends BaseController {
     private IGspTzService gspTzService;
 
     /**
+     * 试验物资列表
+     */
+    @GetMapping("/studyList")
+    public TableDataInfo studyList(GspSearchListForm form)
+    {
+        startPage();
+        List<GspListDto> list = gspService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+    /**
      * 查询供试品管理列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(GspListForm form) {
+    public TableDataInfo list(GspSearchListForm form) {
         startPage();
         List<Gsp> list = gspService.queryList(form);
         return getDataTable(list);

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

@@ -3,6 +3,9 @@ package com.hxhq.business.controller;
 import java.util.List;
 
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gsp.GspListDto;
+import com.hxhq.business.dto.sj.SjListDto;
+import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.GdForm;
 import com.hxhq.business.form.sj.*;
 import com.hxhq.business.service.ISjService;
@@ -37,6 +40,17 @@ public class SjController extends BaseController
     private ISjTzService sjTzService;
 
     /**
+     * 试验物资列表
+     */
+    @GetMapping("/studyList")
+    public TableDataInfo studyList(GspSearchListForm form)
+    {
+        startPage();
+        List<SjListDto> list = sjService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+    /**
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
@@ -62,10 +76,10 @@ public class SjController extends BaseController
      * 查询试剂库存列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(Sj sj)
+    public TableDataInfo list(SjSearchListForm form)
     {
         startPage();
-        List<Sj> list = sjService.queryList(sj);
+        List<Sj> list = sjService.queryList(form);
         return getDataTable(list);
     }
 

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

@@ -0,0 +1,45 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验使用供试品关联对象 t_study_gsp
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+@TableName("t_study_gsp")
+public class StudyGsp extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 供试品id */
+    private Long resourceId;
+
+    /** 试验id */
+    private Long studyId;
+
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验生成、使用试剂关联对象 t_study_sj
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+@TableName("t_study_sj")
+public class StudySj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 试剂id */
+    private Long resourceId;
+
+    /** 试验id */
+    private Long studyId;
+
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspListDto.java

@@ -0,0 +1,562 @@
+package com.hxhq.business.dto.gsp;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hxhq.common.core.annotation.Compare;
+
+import java.util.Date;
+
+/**
+ * 供试品列表
+ */
+public class GspListDto {
+
+    private Long id;
+
+    /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */
+    private Integer zjzt;
+
+    /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
+    private Integer jyzt;
+
+    /** 编辑状态：1:未编辑 3:审核中 */
+    private Integer bjzt;
+
+    /** 库存编辑状态：1:未编辑 3:审核中 */
+    private Integer kcbjzt;
+
+    /** 名称 */
+    @Compare(name = "名称")
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 批号 */
+    @Compare(name = "批号")
+    private String ph;
+
+    /** 规格 */
+    @Compare(name = "规格")
+    private String gg;
+
+    /** 规格 */
+    @Compare(name = "规格单位")
+    private String ggdw;
+
+    /** 库存数量 */
+    private String kc;
+
+    /** 库存单位 */
+    private String kcdw;
+
+    /** 有效期 */
+    @Compare(name = "有效期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yxq;
+
+    /** 接收日期 */
+    @Compare(name = "接收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jsrq;
+
+    /** 存储条件 */
+    @Compare(name = "存储条件")
+    private String cctj;
+
+    /** 注意事项 */
+    @Compare(name = "注意事项")
+    private String zysx;
+
+    /** 名称编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String mcbj;
+
+    /** 批号编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String phbj;
+
+    /** 规格编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String ggbj;
+
+    /** 规格单位 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String ggdwbj;
+
+    /** 有效期编辑 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Date yxqbj;
+
+    /** 接收日期编辑 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Date jsrqbj;
+
+    /** 存储条件编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String cctjbj;
+
+    /** 注意事项编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String zysxbj;
+
+    /** 库存编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String kcbj;
+
+    /** 库存单位编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String kcdwbj;
+
+    /** 编辑备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String bjbz;
+
+    /** 库存备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String kcbjbz;
+
+    /** 编辑人id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long bjrId;
+
+    /** 编辑人名称 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String bjrMc;
+
+    /** 库存编辑人id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long kcbjrId;
+
+    /** 库存编辑人名称 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String kcbjrMc;
+
+    /** 发放转移条件 */
+    private String ffzytj;
+
+    /** 领取人1id */
+    private Long lqr1Id;
+
+    /** 领取人2id */
+    private Long lqr2Id;
+
+    /** 发放人1id */
+    private Long ffr1Id;
+
+    /** 发放人2id */
+    private Long ffr2Id;
+
+    /** 领取人1名称 */
+    private String lqr1Mc;
+
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
+    /** 发放日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ffrq;
+
+    /** 发放备注 */
+    private String ffbz;
+
+    /** 发放目的ids */
+    private String mdIds;
+
+    /** 关联暂存柜id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long zcgId;
+
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getZjzt() {
+        return zjzt;
+    }
+
+    public void setZjzt(Integer zjzt) {
+        this.zjzt = zjzt;
+    }
+
+    public Integer getJyzt() {
+        return jyzt;
+    }
+
+    public void setJyzt(Integer jyzt) {
+        this.jyzt = jyzt;
+    }
+
+    public Integer getBjzt() {
+        return bjzt;
+    }
+
+    public void setBjzt(Integer bjzt) {
+        this.bjzt = bjzt;
+    }
+
+    public Integer getKcbjzt() {
+        return kcbjzt;
+    }
+
+    public void setKcbjzt(Integer kcbjzt) {
+        this.kcbjzt = kcbjzt;
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getGg() {
+        return gg;
+    }
+
+    public void setGg(String gg) {
+        this.gg = gg;
+    }
+
+    public String getGgdw() {
+        return ggdw;
+    }
+
+    public void setGgdw(String ggdw) {
+        this.ggdw = ggdw;
+    }
+
+    public String getKc() {
+        return kc;
+    }
+
+    public void setKc(String kc) {
+        this.kc = kc;
+    }
+
+    public String getKcdw() {
+        return kcdw;
+    }
+
+    public void setKcdw(String kcdw) {
+        this.kcdw = kcdw;
+    }
+
+    public Date getYxq() {
+        return yxq;
+    }
+
+    public void setYxq(Date yxq) {
+        this.yxq = yxq;
+    }
+
+    public Date getJsrq() {
+        return jsrq;
+    }
+
+    public void setJsrq(Date jsrq) {
+        this.jsrq = jsrq;
+    }
+
+    public String getCctj() {
+        return cctj;
+    }
+
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
+    }
+
+    public String getZysx() {
+        return zysx;
+    }
+
+    public void setZysx(String zysx) {
+        this.zysx = zysx;
+    }
+
+    public String getMcbj() {
+        return mcbj;
+    }
+
+    public void setMcbj(String mcbj) {
+        this.mcbj = mcbj;
+    }
+
+    public String getPhbj() {
+        return phbj;
+    }
+
+    public void setPhbj(String phbj) {
+        this.phbj = phbj;
+    }
+
+    public String getGgbj() {
+        return ggbj;
+    }
+
+    public void setGgbj(String ggbj) {
+        this.ggbj = ggbj;
+    }
+
+    public String getGgdwbj() {
+        return ggdwbj;
+    }
+
+    public void setGgdwbj(String ggdwbj) {
+        this.ggdwbj = ggdwbj;
+    }
+
+    public Date getYxqbj() {
+        return yxqbj;
+    }
+
+    public void setYxqbj(Date yxqbj) {
+        this.yxqbj = yxqbj;
+    }
+
+    public Date getJsrqbj() {
+        return jsrqbj;
+    }
+
+    public void setJsrqbj(Date jsrqbj) {
+        this.jsrqbj = jsrqbj;
+    }
+
+    public String getCctjbj() {
+        return cctjbj;
+    }
+
+    public void setCctjbj(String cctjbj) {
+        this.cctjbj = cctjbj;
+    }
+
+    public String getZysxbj() {
+        return zysxbj;
+    }
+
+    public void setZysxbj(String zysxbj) {
+        this.zysxbj = zysxbj;
+    }
+
+    public String getKcbj() {
+        return kcbj;
+    }
+
+    public void setKcbj(String kcbj) {
+        this.kcbj = kcbj;
+    }
+
+    public String getKcdwbj() {
+        return kcdwbj;
+    }
+
+    public void setKcdwbj(String kcdwbj) {
+        this.kcdwbj = kcdwbj;
+    }
+
+    public String getBjbz() {
+        return bjbz;
+    }
+
+    public void setBjbz(String bjbz) {
+        this.bjbz = bjbz;
+    }
+
+    public String getKcbjbz() {
+        return kcbjbz;
+    }
+
+    public void setKcbjbz(String kcbjbz) {
+        this.kcbjbz = kcbjbz;
+    }
+
+    public Long getBjrId() {
+        return bjrId;
+    }
+
+    public void setBjrId(Long bjrId) {
+        this.bjrId = bjrId;
+    }
+
+    public String getBjrMc() {
+        return bjrMc;
+    }
+
+    public void setBjrMc(String bjrMc) {
+        this.bjrMc = bjrMc;
+    }
+
+    public Long getKcbjrId() {
+        return kcbjrId;
+    }
+
+    public void setKcbjrId(Long kcbjrId) {
+        this.kcbjrId = kcbjrId;
+    }
+
+    public String getKcbjrMc() {
+        return kcbjrMc;
+    }
+
+    public void setKcbjrMc(String kcbjrMc) {
+        this.kcbjrMc = kcbjrMc;
+    }
+
+    public String getFfzytj() {
+        return ffzytj;
+    }
+
+    public void setFfzytj(String ffzytj) {
+        this.ffzytj = ffzytj;
+    }
+
+    public Long getLqr1Id() {
+        return lqr1Id;
+    }
+
+    public void setLqr1Id(Long lqr1Id) {
+        this.lqr1Id = lqr1Id;
+    }
+
+    public Long getLqr2Id() {
+        return lqr2Id;
+    }
+
+    public void setLqr2Id(Long lqr2Id) {
+        this.lqr2Id = lqr2Id;
+    }
+
+    public Long getFfr1Id() {
+        return ffr1Id;
+    }
+
+    public void setFfr1Id(Long ffr1Id) {
+        this.ffr1Id = ffr1Id;
+    }
+
+    public Long getFfr2Id() {
+        return ffr2Id;
+    }
+
+    public void setFfr2Id(Long ffr2Id) {
+        this.ffr2Id = ffr2Id;
+    }
+
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfr1Mc() {
+        return ffr1Mc;
+    }
+
+    public void setFfr1Mc(String ffr1Mc) {
+        this.ffr1Mc = ffr1Mc;
+    }
+
+    public String getFfr2Mc() {
+        return ffr2Mc;
+    }
+
+    public void setFfr2Mc(String ffr2Mc) {
+        this.ffr2Mc = ffr2Mc;
+    }
+
+    public Date getFfrq() {
+        return ffrq;
+    }
+
+    public void setFfrq(Date ffrq) {
+        this.ffrq = ffrq;
+    }
+
+    public String getFfbz() {
+        return ffbz;
+    }
+
+    public void setFfbz(String ffbz) {
+        this.ffbz = ffbz;
+    }
+
+    public String getMdIds() {
+        return mdIds;
+    }
+
+    public void setMdIds(String mdIds) {
+        this.mdIds = mdIds;
+    }
+
+    public Long getZcgId() {
+        return zcgId;
+    }
+
+    public void setZcgId(Long zcgId) {
+        this.zcgId = zcgId;
+    }
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java

@@ -0,0 +1,6 @@
+package com.hxhq.business.dto.sj;
+
+import com.hxhq.business.domain.Sj;
+
+public class SjListDto extends Sj {
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSearchListForm.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 供试品列表
  */
-public class GspListForm {
+public class GspSearchListForm {
 
     /** 名称/代号 */
     private String mc;
@@ -21,6 +21,9 @@ public class GspListForm {
     /** 批号 */
     private String ph;
 
+    /** 来源 */
+    private String ly;
+
     /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */
     private Integer zjzt;
 
@@ -33,6 +36,25 @@ public class GspListForm {
     /** 有效期结束日期 */
     private String endDate;
 
+    /** 试验id */
+    private Long studyId;
+
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
     public String getMc() {
         return mc;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java

@@ -0,0 +1,106 @@
+package com.hxhq.business.form.sj;
+
+/**
+ * 试剂列表搜索参数
+ */
+public class SjSearchListForm {
+
+    /** 名称/代号 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 批号 */
+    private String ph;
+
+    /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */
+    private Integer zjzt;
+
+    /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
+    private Integer jyzt;
+
+    /** 失效日开始日期 */
+    private String startDate;
+
+    /** 失效日结束日期 */
+    private String endDate;
+
+    /** 试验id */
+    private Long studyId;
+
+    /** 试验名称 */
+    private String studyMc;
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public Integer getZjzt() {
+        return zjzt;
+    }
+
+    public void setZjzt(Integer zjzt) {
+        this.zjzt = zjzt;
+    }
+
+    public Integer getJyzt() {
+        return jyzt;
+    }
+
+    public void setJyzt(Integer jyzt) {
+        this.jyzt = jyzt;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+}

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

@@ -1,7 +1,15 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hxhq.business.domain.Gsp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.dto.gsp.GspListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 供试品管理Mapper接口
  *
@@ -11,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface GspMapper extends BaseMapper<Gsp>
 {
 
+    List<GspListDto> queryStudyList(@Param("ew") Wrapper<Gsp> queryWrapper);
 }

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

@@ -1,7 +1,15 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.Sj;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.dto.sj.SjListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 试剂Mapper接口
  *
@@ -11,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SjMapper extends BaseMapper<Sj>
 {
 
+    List<SjListDto> queryStudyList(@Param("ew") Wrapper<Sj> queryWrapper);
 }

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyGsp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验使用供试品关联Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+public interface StudyGspMapper extends BaseMapper<StudyGsp>
+{
+
+}

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudySj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验生成、使用试剂关联Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+public interface StudySjMapper extends BaseMapper<StudySj>
+{
+
+}

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

@@ -3,9 +3,9 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.Gsp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.form.gsp.*;
-import com.hxhq.business.form.mjy.XgkcForm;
-import com.hxhq.business.form.sj.CzSjForm;
+import com.hxhq.business.form.gyzj.SearchForm;
 
 /**
  * 供试品管理Service接口
@@ -21,7 +21,7 @@ public interface IGspService extends IService
      * @param form 供试品列表参数
      * @return 供试品管理集合
      */
-    public List<Gsp> queryList(GspListForm form);
+    public List<Gsp> queryList(GspSearchListForm form);
 
     /**
      * 新增供试品
@@ -83,4 +83,6 @@ public interface IGspService extends IService
     /** 归还 */
     void gh(GspGhForm form);
 
+    /** 试验关联的供试品列表 */
+    List<GspListDto> queryStudyList(GspSearchListForm form);
 }

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

@@ -3,6 +3,9 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.Sj;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.gsp.GspListDto;
+import com.hxhq.business.dto.sj.SjListDto;
+import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.GdForm;
 import com.hxhq.business.form.sj.*;
 
@@ -17,10 +20,10 @@ public interface ISjService extends IService
     /**
      * 查询试剂库存列表
      *
-     * @param sj 试剂库存
+     * @param form 试剂库存
      * @return 试剂库存集合
      */
-    public List<Sj> queryList(Sj sj);
+    public List<Sj> queryList(SjSearchListForm form);
 
     /** 修改库存 */
     void xgkc(SjXgkcForm form);
@@ -55,4 +58,6 @@ public interface ISjService extends IService
     /** 编辑 */
     void bj(SjBjForm form);
 
+    /** 试验物资列表 */
+    List<SjListDto> queryStudyList(GspSearchListForm form);
 }

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

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyGsp;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验使用供试品关联Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+public interface IStudyGspService extends IService<StudyGsp>
+{
+    /**
+     * 查询试验使用供试品关联列表
+     *
+     * @param studyGsp 试验使用供试品关联
+     * @return 试验使用供试品关联集合
+     */
+    public List<StudyGsp> queryList(StudyGsp studyGsp);
+
+}

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

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudySj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验生成、使用试剂关联Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+public interface IStudySjService extends IService<StudySj>
+{
+    /**
+     * 查询试验生成、使用试剂关联列表
+     *
+     * @param studySj 试验生成、使用试剂关联
+     * @return 试验生成、使用试剂关联集合
+     */
+    public List<StudySj> queryList(StudySj studySj);
+
+}

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

@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gsp.*;
-import com.hxhq.business.form.mjy.PlffItem;
-import com.hxhq.business.form.sj.PlczSjItemForm;
+import com.hxhq.business.form.gyzj.SearchForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
@@ -59,7 +59,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
      * @return 供试品管理
      */
     @Override
-    public List<Gsp> queryList(GspListForm form) {
+    public List<Gsp> queryList(GspSearchListForm form) {
         LambdaQueryWrapper<Gsp> queryWrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotEmpty(form.getMc())) {
             queryWrapper.like(Gsp::getMc, form.getMc());
@@ -898,4 +898,31 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
     }
 
+    @Override
+    public List<GspListDto> queryStudyList(GspSearchListForm form) {
+        QueryWrapper<Gsp> queryWrapper = Wrappers.query();
+        queryWrapper.eq("ts.del_flag", "0");
+        queryWrapper.eq("ts.study_id", form.getStudyId());
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getZjzt() != null && form.getZjzt().intValue() > 0) {
+            queryWrapper.eq("t.zjzt", form.getZjzt());
+        }
+        if (com.hxhq.common.core.utils.StringUtils.isNoneBlank(form.getMc())) {
+            queryWrapper.and(p -> p.like("t.`mc`", form.getMc()));
+        }
+        if (com.hxhq.common.core.utils.StringUtils.isNoneBlank(form.getBh())) {
+            queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
+        }
+        if (com.hxhq.common.core.utils.StringUtils.isNoneBlank(form.getStartDate())) {
+            queryWrapper.apply("t.yxq>={0}", form.getStartDate());
+        }
+        if (com.hxhq.common.core.utils.StringUtils.isNoneBlank(form.getEndDate())) {
+            queryWrapper.apply("t.yxq<{0}", form.getEndDate());
+        }
+        queryWrapper.orderByDesc("ts.id");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
 }

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

@@ -5,13 +5,16 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.Sj;
 import com.hxhq.business.domain.SjTz;
 import com.hxhq.business.domain.SjJcgj;
+import com.hxhq.business.dto.sj.SjListDto;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.enums.zykgl.JyztEnum;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
+import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.GdForm;
 import com.hxhq.business.form.sj.*;
 import com.hxhq.business.service.ISjTzService;
@@ -22,6 +25,7 @@ import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.system.api.domain.SysUser;
 import com.hxhq.system.service.ISysUserService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,13 +56,32 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
     /**
      * 查询试剂库存列表
      *
-     * @param sj 试剂库存
+     * @param form 试剂库存
      * @return 试剂库存
      */
     @Override
-    public List<Sj> queryList(Sj sj)
+    public List<Sj> queryList(SjSearchListForm form)
     {
         QueryWrapper<Sj> queryWrapper = Wrappers.query();
+        if(StringUtils.isNotEmpty(form.getMc())) {
+            queryWrapper.like("mc", form.getMc());
+        }
+        if(StringUtils.isNotEmpty(form.getBh())) {
+            queryWrapper.like("bh", form.getBh());
+        }
+        if(StringUtils.isNotEmpty(form.getStartDate())) {
+            queryWrapper.ge("sxr", form.getStartDate());
+        }
+        if(StringUtils.isNotEmpty(form.getEndDate())) {
+            queryWrapper.le("sxr", form.getEndDate());
+        }
+        if(form.getZjzt() != null) {
+            queryWrapper.eq("zjzt", form.getZjzt());
+        }
+        if(form.getJyzt() != null) {
+            queryWrapper.eq("jyzt", form.getJyzt());
+        }
+        queryWrapper.orderByDesc("id");
         return this.list(queryWrapper);
     }
 
@@ -459,4 +482,34 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         sjJcgjService.saveBatch(gspJcgjList);
     }
 
+    @Override
+    public List<SjListDto> queryStudyList(GspSearchListForm form) {
+        QueryWrapper<Sj> queryWrapper = Wrappers.query();
+        queryWrapper.eq("ts.del_flag", "0");
+        queryWrapper.eq("ts.study_id", form.getStudyId());
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getZjzt() != null && form.getZjzt().intValue() > 0) {
+            queryWrapper.eq("t.zjzt", form.getZjzt());
+        }
+        if(StringUtils.isNotEmpty(form.getLy())) {
+            queryWrapper.like("t.ly", form.getLy());
+        }
+        if (StringUtils.isNoneBlank(form.getMc())) {
+            queryWrapper.and(p -> p.like("t.`mc`", form.getMc()));
+        }
+        if (StringUtils.isNoneBlank(form.getBh())) {
+            queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
+        }
+        if (StringUtils.isNoneBlank(form.getStartDate())) {
+            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+        }
+        if (StringUtils.isNoneBlank(form.getEndDate())) {
+            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+        }
+        queryWrapper.orderByDesc("ts.id");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
 }

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

@@ -0,0 +1,35 @@
+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.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudyGspMapper;
+import com.hxhq.business.domain.StudyGsp;
+import com.hxhq.business.service.IStudyGspService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验使用供试品关联Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+@Service
+public class StudyGspServiceImpl extends ServiceImpl<StudyGspMapper, StudyGsp> implements IStudyGspService
+{
+    /**
+     * 查询试验使用供试品关联列表
+     *
+     * @param studyGsp 试验使用供试品关联
+     * @return 试验使用供试品关联
+     */
+    @Override
+    public List<StudyGsp> queryList(StudyGsp studyGsp)
+    {
+        QueryWrapper<StudyGsp> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

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

@@ -0,0 +1,35 @@
+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.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudySjMapper;
+import com.hxhq.business.domain.StudySj;
+import com.hxhq.business.service.IStudySjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验生成、使用试剂关联Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-10
+ */
+@Service
+public class StudySjServiceImpl extends ServiceImpl<StudySjMapper, StudySj> implements IStudySjService
+{
+    /**
+     * 查询试验生成、使用试剂关联列表
+     *
+     * @param studySj 试验生成、使用试剂关联
+     * @return 试验生成、使用试剂关联
+     */
+    @Override
+    public List<StudySj> queryList(StudySj studySj)
+    {
+        QueryWrapper<StudySj> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

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

@@ -3,4 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.GspMapper">
+    <select id="queryStudyList" resultType="com.hxhq.business.dto.gsp.GspListDto">
+        select t.id,t.mc,t.bh, t.ph, t.gg,tggdw, t.yxq,t.kc,t.kcdw,t.zjzt
+        FROM `t_study_gsp` ts
+        join  `t_gsp` t on t.id=ts.resource_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

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

@@ -3,4 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.SjMapper">
+    <select id="queryStudyList" resultType="com.hxhq.business.dto.sj.SjListDto">
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxr,t.zjzt,t.ly
+        FROM `t_study_sj` ts
+        join  `t_sj` t on t.id=ts.resource_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGspMapper.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.StudyGspMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudySjMapper.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.StudySjMapper">
+</mapper>