diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjkcController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjkcController.java new file mode 100644 index 0000000..9a4f3e6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjkcController.java @@ -0,0 +1,65 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.domain.Sjkc; +import com.hxhq.business.service.ISjkcService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 试剂库存Controller + * + * @author HanLong + * @date 2025-12-22 + */ +@RestController +@RequestMapping("/business/sjkc") +public class SjkcController extends BaseController +{ + @Autowired + private ISjkcService sjkcService; + + /** + * 查询试剂库存列表 + */ + @GetMapping("/list") + public TableDataInfo list(Sjkc sjkc) + { + startPage(); + List list = sjkcService.queryList(sjkc); + return getDataTable(list); + } + + /** + * 获取试剂库存详细信息 + */ + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) + { + return AjaxResult.success(sjkcService.getById(id)); + } + + /** + * 新增试剂库存信息 + */ + @PostMapping("/save") + public AjaxResult save(@RequestBody Sjkc sjkc) + { + return toAjax(sjkcService.saveOrUpdate(sjkc)); + } + + /** + * 删除试剂库存信息 + */ + @PostMapping("/delete") + public AjaxResult delete(@RequestBody Long[] ids) + { + return toAjax(sjkcService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sjkc.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sjkc.java new file mode 100644 index 0000000..9cee493 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sjkc.java @@ -0,0 +1,249 @@ +package com.hxhq.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试剂库存对象 t_sjkc + * + * @author HanLong + * @date 2025-12-22 + */ +@TableName("t_sjkc") +public class Sjkc extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 制剂状态 1:入库 5:已锁定 7:待归档 9:归档 11:待解档 */ + private Integer zjzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 所属部门 */ + private String ssbm; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 批号 */ + private String ph; + + /** 规格 */ + private String gg; + + /** 浓度/含量/纯度 */ + private String nd; + + /** 浓度单位 */ + private String nddw; + + /** 库存数量 */ + private String kcsl; + + /** 库存单位 */ + private String kcdw; + + /** 来源 */ + private String ly; + + /** 存储条件 */ + private String cctj; + + /** 存储位置 */ + private String ccwz; + + /** 有效周期 */ + private String yxzq; + + /** 有效周期单位 */ + private String yxzqdw; + + /** 失效日 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxr; + + /** 配置日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pzrq; + + + public void setZjzt(Integer zjzt) + { + this.zjzt = zjzt; + } + + public Integer getZjzt() + { + return zjzt; + } + + public void setJyzt(Integer jyzt) + { + this.jyzt = jyzt; + } + + public Integer getJyzt() + { + return jyzt; + } + + public void setMc(String mc) + { + this.mc = mc; + } + + public String getMc() + { + return mc; + } + + public void setBh(String bh) + { + this.bh = bh; + } + + public String getBh() + { + return bh; + } + + public void setPh(String ph) + { + this.ph = ph; + } + + public String getPh() + { + return ph; + } + + public void setGg(String gg) + { + this.gg = gg; + } + + public String getGg() + { + return gg; + } + + public void setNd(String nd) + { + this.nd = nd; + } + + public String getNd() + { + return nd; + } + + public void setKcsl(String kcsl) + { + this.kcsl = kcsl; + } + + public String getKcsl() + { + return kcsl; + } + + public void setKcdw(String kcdw) + { + this.kcdw = kcdw; + } + + public String getKcdw() + { + return kcdw; + } + + public void setLy(String ly) + { + this.ly = ly; + } + + public String getLy() + { + return ly; + } + + public void setCctj(String cctj) + { + this.cctj = cctj; + } + + public String getCctj() + { + return cctj; + } + + public void setCcwz(String ccwz) + { + this.ccwz = ccwz; + } + + public String getCcwz() + { + return ccwz; + } + + + public void setSxr(Date sxr) + { + this.sxr = sxr; + } + + public Date getSxr() + { + return sxr; + } + + public void setPzrq(Date pzrq) + { + this.pzrq = pzrq; + } + + public Date getPzrq() + { + return pzrq; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + public void setYxzq(String yxzq) { + this.yxzq = yxzq; + } + + public String getYxzqdw() { + return yxzqdw; + } + + public void setYxzqdw(String yxzqdw) { + this.yxzqdw = yxzqdw; + } + + public String getSsbm() { + return ssbm; + } + + public void setSsbm(String ssbm) { + this.ssbm = ssbm; + } + + public String getYxzq() { + return yxzq; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SjkcJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SjkcJcgj.java new file mode 100644 index 0000000..19ea5cc --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SjkcJcgj.java @@ -0,0 +1,110 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试剂库存-稽查轨迹对象 t_sjkc_jcgj + * + * @author HanLong + * @date 2025-12-22 + */ +@TableName("t_sjkc_jcgj") +public class SjkcJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 试剂库存id */ + private Long sjkcId; + + /** 稽查轨迹类型 */ + private String jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 */ + private Long jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名意义 */ + private String qmyy; + + /** 签名人id */ + private Long qmrId; + + + public void setSjkcId(Long sjkcId) + { + this.sjkcId = sjkcId; + } + + public Long getSjkcId() + { + return sjkcId; + } + + public void setJcgjlx(String jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public String getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Long jcmcys) + { + this.jcmcys = jcmcys; + } + + public Long getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + 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; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java new file mode 100644 index 0000000..80328bc --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java @@ -0,0 +1,110 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 仪器管理-稽查轨迹对象 t_yq_jcgj + * + * @author HanLong + * @date 2025-12-22 + */ +@TableName("t_yq_jcgj") +public class YqJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 仪器id */ + private Long yqId; + + /** 稽查轨迹类型 */ + private String jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 */ + private Long jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名意义 */ + private String qmyy; + + /** 签名人id */ + private Long qmrId; + + + public void setYqId(Long yqId) + { + this.yqId = yqId; + } + + public Long getYqId() + { + return yqId; + } + + public void setJcgjlx(String jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public String getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Long jcmcys) + { + this.jcmcys = jcmcys; + } + + public Long getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + 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; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcJcgjMapper.java new file mode 100644 index 0000000..36d5305 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.SjkcJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试剂库存-稽查轨迹Mapper接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface SjkcJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcMapper.java new file mode 100644 index 0000000..c9c078f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjkcMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.Sjkc; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试剂库存Mapper接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface SjkcMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqJcgjMapper.java new file mode 100644 index 0000000..4d2ce51 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.YqJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 仪器管理-稽查轨迹Mapper接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface YqJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcJcgjService.java new file mode 100644 index 0000000..2d93337 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcJcgjService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.SjkcJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试剂库存-稽查轨迹Service接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface ISjkcJcgjService extends IService +{ + /** + * 查询试剂库存-稽查轨迹列表 + * + * @param sjkcJcgj 试剂库存-稽查轨迹 + * @return 试剂库存-稽查轨迹集合 + */ + public List queryList(SjkcJcgj sjkcJcgj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcService.java new file mode 100644 index 0000000..81af8bf --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjkcService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.Sjkc; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试剂库存Service接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface ISjkcService extends IService +{ + /** + * 查询试剂库存列表 + * + * @param sjkc 试剂库存 + * @return 试剂库存集合 + */ + public List queryList(Sjkc sjkc); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java new file mode 100644 index 0000000..3251e4c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.YqJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 仪器管理-稽查轨迹Service接口 + * + * @author HanLong + * @date 2025-12-22 + */ +public interface IYqJcgjService extends IService +{ + /** + * 查询仪器管理-稽查轨迹列表 + * + * @param yqJcgj 仪器管理-稽查轨迹 + * @return 仪器管理-稽查轨迹集合 + */ + public List queryList(YqJcgj yqJcgj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcJcgjServiceImpl.java new file mode 100644 index 0000000..a3b9942 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcJcgjServiceImpl.java @@ -0,0 +1,34 @@ +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 org.springframework.stereotype.Service; +import com.hxhq.business.mapper.SjkcJcgjMapper; +import com.hxhq.business.domain.SjkcJcgj; +import com.hxhq.business.service.ISjkcJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试剂库存-稽查轨迹Service业务层处理 + * + * @author HanLong + * @date 2025-12-22 + */ +@Service +public class SjkcJcgjServiceImpl extends ServiceImpl implements ISjkcJcgjService +{ + /** + * 查询试剂库存-稽查轨迹列表 + * + * @param sjkcJcgj 试剂库存-稽查轨迹 + * @return 试剂库存-稽查轨迹 + */ + @Override + public List queryList(SjkcJcgj sjkcJcgj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcServiceImpl.java new file mode 100644 index 0000000..1e7c6a2 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjkcServiceImpl.java @@ -0,0 +1,34 @@ +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 org.springframework.stereotype.Service; +import com.hxhq.business.mapper.SjkcMapper; +import com.hxhq.business.domain.Sjkc; +import com.hxhq.business.service.ISjkcService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试剂库存Service业务层处理 + * + * @author HanLong + * @date 2025-12-22 + */ +@Service +public class SjkcServiceImpl extends ServiceImpl implements ISjkcService +{ + /** + * 查询试剂库存列表 + * + * @param sjkc 试剂库存 + * @return 试剂库存 + */ + @Override + public List queryList(Sjkc sjkc) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java new file mode 100644 index 0000000..f731731 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java @@ -0,0 +1,34 @@ +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 org.springframework.stereotype.Service; +import com.hxhq.business.mapper.YqJcgjMapper; +import com.hxhq.business.domain.YqJcgj; +import com.hxhq.business.service.IYqJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 仪器管理-稽查轨迹Service业务层处理 + * + * @author HanLong + * @date 2025-12-22 + */ +@Service +public class YqJcgjServiceImpl extends ServiceImpl implements IYqJcgjService +{ + /** + * 查询仪器管理-稽查轨迹列表 + * + * @param yqJcgj 仪器管理-稽查轨迹 + * @return 仪器管理-稽查轨迹 + */ + @Override + public List queryList(YqJcgj yqJcgj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcJcgjMapper.xml new file mode 100644 index 0000000..6f7f8dc --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcMapper.xml new file mode 100644 index 0000000..599ae7a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjkcMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqJcgjMapper.xml new file mode 100644 index 0000000..e0686c9 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file