From b646c0a5efc9603c46a412b92f1d35abeb032f37 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Sat, 10 Jan 2026 17:49:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=88=97=E8=A1=A8]=E8=AF=95=E5=89=82?= =?UTF-8?q?=E3=80=81=E4=BE=9B=E8=AF=95=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/GspController.java | 19 +- .../com/hxhq/business/controller/SjController.java | 18 +- .../java/com/hxhq/business/domain/StudyGsp.java | 45 ++ .../java/com/hxhq/business/domain/StudySj.java | 45 ++ .../java/com/hxhq/business/dto/gsp/GspListDto.java | 562 +++++++++++++++++++++ .../java/com/hxhq/business/dto/sj/SjListDto.java | 6 + .../com/hxhq/business/form/gsp/GspListForm.java | 91 ---- .../hxhq/business/form/gsp/GspSearchListForm.java | 113 +++++ .../hxhq/business/form/sj/SjSearchListForm.java | 106 ++++ .../java/com/hxhq/business/mapper/GspMapper.java | 9 + .../java/com/hxhq/business/mapper/SjMapper.java | 9 + .../com/hxhq/business/mapper/StudyGspMapper.java | 14 + .../com/hxhq/business/mapper/StudySjMapper.java | 14 + .../com/hxhq/business/service/IGspService.java | 8 +- .../java/com/hxhq/business/service/ISjService.java | 9 +- .../hxhq/business/service/IStudyGspService.java | 23 + .../com/hxhq/business/service/IStudySjService.java | 23 + .../hxhq/business/service/impl/GspServiceImpl.java | 33 +- .../hxhq/business/service/impl/SjServiceImpl.java | 57 ++- .../business/service/impl/StudyGspServiceImpl.java | 35 ++ .../business/service/impl/StudySjServiceImpl.java | 35 ++ .../main/resources/mapper/business/GspMapper.xml | 10 + .../main/resources/mapper/business/SjMapper.xml | 10 + .../resources/mapper/business/StudyGspMapper.xml | 6 + .../resources/mapper/business/StudySjMapper.xml | 6 + 25 files changed, 1198 insertions(+), 108 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGsp.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySj.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspListDto.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSearchListForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGspMapper.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudySjMapper.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGspService.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGspServiceImpl.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySjServiceImpl.java create mode 100644 hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGspMapper.xml create mode 100644 hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudySjMapper.xml diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java index 2cda9d1..7b46b50 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java +++ b/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 list = gspService.queryStudyList(form); + return getDataTable(list); + } + + /** * 查询供试品管理列表 */ @GetMapping("/list") - public TableDataInfo list(GspListForm form) { + public TableDataInfo list(GspSearchListForm form) { startPage(); List list = gspService.queryList(form); return getDataTable(list); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java index bc63b81..eac7274 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java +++ b/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 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 list = sjService.queryList(sj); + List list = sjService.queryList(form); return getDataTable(list); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGsp.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGsp.java new file mode 100644 index 0000000..f30e63f --- /dev/null +++ b/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; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySj.java new file mode 100644 index 0000000..417c16f --- /dev/null +++ b/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; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspListDto.java new file mode 100644 index 0000000..4698c41 --- /dev/null +++ b/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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java new file mode 100644 index 0000000..e657db9 --- /dev/null +++ b/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 { +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java deleted file mode 100644 index d18a712..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hxhq.business.form.gsp; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * 供试品列表 - */ -public class GspListForm { - - /** 名称/代号 */ - 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; - - 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; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSearchListForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSearchListForm.java new file mode 100644 index 0000000..53380c0 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSearchListForm.java @@ -0,0 +1,113 @@ +package com.hxhq.business.form.gsp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 供试品列表 + */ +public class GspSearchListForm { + + /** 名称/代号 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 批号 */ + private String ph; + + /** 来源 */ + private String ly; + + /** 制剂状态 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; + + 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; + } + + 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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java new file mode 100644 index 0000000..624fc6d --- /dev/null +++ b/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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java index 20e82f2..d638bab 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java +++ b/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 { + List queryStudyList(@Param("ew") Wrapper queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java index eee2de6..acb0a95 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java +++ b/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 { + List queryStudyList(@Param("ew") Wrapper queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGspMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGspMapper.java new file mode 100644 index 0000000..0aca21c --- /dev/null +++ b/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 +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudySjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudySjMapper.java new file mode 100644 index 0000000..6696248 --- /dev/null +++ b/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 +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java index 06a7d36..b0f9672 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java +++ b/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 queryList(GspListForm form); + public List queryList(GspSearchListForm form); /** * 新增供试品 @@ -83,4 +83,6 @@ public interface IGspService extends IService /** 归还 */ void gh(GspGhForm form); + /** 试验关联的供试品列表 */ + List queryStudyList(GspSearchListForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java index a9884d2..e913b37 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java +++ b/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 queryList(Sj sj); + public List queryList(SjSearchListForm form); /** 修改库存 */ void xgkc(SjXgkcForm form); @@ -55,4 +58,6 @@ public interface ISjService extends IService /** 编辑 */ void bj(SjBjForm form); + /** 试验物资列表 */ + List queryStudyList(GspSearchListForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGspService.java new file mode 100644 index 0000000..455b8b5 --- /dev/null +++ b/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 +{ + /** + * 查询试验使用供试品关联列表 + * + * @param studyGsp 试验使用供试品关联 + * @return 试验使用供试品关联集合 + */ + public List queryList(StudyGsp studyGsp); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java new file mode 100644 index 0000000..8bd39db --- /dev/null +++ b/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 +{ + /** + * 查询试验生成、使用试剂关联列表 + * + * @param studySj 试验生成、使用试剂关联 + * @return 试验生成、使用试剂关联集合 + */ + public List queryList(StudySj studySj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index 5c3b4d6..73d2287 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/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 queryList(GspListForm form) { + public List queryList(GspSearchListForm form) { LambdaQueryWrapper 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 queryStudyList(GspSearchListForm form) { + QueryWrapper 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); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 7a199bd..ec9b85e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/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 queryList(Sj sj) + public List queryList(SjSearchListForm form) { QueryWrapper 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 queryStudyList(GspSearchListForm form) { + QueryWrapper 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); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGspServiceImpl.java new file mode 100644 index 0000000..ffe92c2 --- /dev/null +++ b/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 implements IStudyGspService +{ + /** + * 查询试验使用供试品关联列表 + * + * @param studyGsp 试验使用供试品关联 + * @return 试验使用供试品关联 + */ + @Override + public List queryList(StudyGsp studyGsp) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySjServiceImpl.java new file mode 100644 index 0000000..212d55d --- /dev/null +++ b/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 implements IStudySjService +{ + /** + * 查询试验生成、使用试剂关联列表 + * + * @param studySj 试验生成、使用试剂关联 + * @return 试验生成、使用试剂关联 + */ + @Override + public List queryList(StudySj studySj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml index 07076b4..02e34f8 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml +++ b/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"> + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml index 52b5666..5de0fdc 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml +++ b/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"> + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGspMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGspMapper.xml new file mode 100644 index 0000000..fcbce7e --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGspMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudySjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudySjMapper.xml new file mode 100644 index 0000000..b2c25c8 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudySjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file