diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java index 09d4193..ce3a285 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java @@ -1,12 +1,17 @@ package com.hxhq.business.controller; -import java.util.Arrays; import java.util.List; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.business.domain.GyzjTz; +import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.form.gyzj.*; +import com.hxhq.business.service.IGyzjJcgjService; +import com.hxhq.business.service.IGyzjTzService; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.Gyzj; import com.hxhq.business.service.IGyzjService; import com.hxhq.common.core.web.controller.BaseController; import com.hxhq.common.core.web.domain.AjaxResult; @@ -25,42 +30,290 @@ public class GyzjController extends BaseController { @Autowired private IGyzjService gyzjService; + @Autowired + private IGyzjTzService gyzjTzService; + @Autowired + private IGyzjJcgjService gyzjJcgjService; /** - * 查询给药制剂列表 + * 列表 */ + @RequiresPermissions("business:resource:gyzj:list") @GetMapping("/list") - public TableDataInfo list(Gyzj gyzj) + public TableDataInfo list(SearchForm form) + { + startPage(); + List list = gyzjService.queryList(form); + return getDataTable(list); + } + + /** + * 稽查轨迹列表 + */ + @RequiresPermissions("business:resource:gyzj:list") + @GetMapping("/jcgjList") + public TableDataInfo jcgjList(GyzjJcgj form) + { + startPage(); + List list = gyzjJcgjService.queryList(form); + return getDataTable(list); + } + + /** + * 台账列表 + */ + @RequiresPermissions("business:resource:gyzj:list") + @GetMapping("/tzList") + public TableDataInfo tzList(GyzjTz form) { startPage(); - List list = gyzjService.queryList(gyzj); + List list = gyzjTzService.queryList(form); return getDataTable(list); } /** - * 获取给药制剂详细信息 + * 详细信息 */ + @RequiresPermissions("business:resource:gyzj:xq") @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { - return AjaxResult.success(gyzjService.getById(id)); + return AjaxResult.success(gyzjService.queryInfo(id)); + } + + /** + * 解档 + */ + @PostMapping("/jd") + @RequiresPermissions("business:resource:gyzj:jd") + public AjaxResult jd(@RequestBody JdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + @RequiresPermissions("business:resource:gyzj:gd") + public AjaxResult plgd(@RequestBody GdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + @RequiresPermissions("business:resource:gyzj:gd") + public AjaxResult gd(@RequestBody GdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.gd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + @RequiresPermissions("business:resource:gyzj:sd") + public AjaxResult plsd(@RequestBody SdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + @RequiresPermissions("business:resource:gyzj:sd") + public AjaxResult sd(@RequestBody SdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.sd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 解锁 + */ + @PostMapping("/js") + @RequiresPermissions("business:resource:gyzj:js") + public AjaxResult js(@RequestBody JsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.js(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量处置药剂 + */ + @PostMapping("/plczyj") + @RequiresPermissions("business:resource:gyzj:czyj") + public AjaxResult plczyj(@RequestBody PlczyjForm form) + { + form.setClrId(SecurityUtils.getUserId()); + gyzjService.plczyj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 处置药剂 + */ + @PostMapping("/czyj") + @RequiresPermissions("business:resource:gyzj:czyj") + public AjaxResult czyj(@RequestBody CzyjForm form) + { + form.setClrId(SecurityUtils.getUserId()); + gyzjService.czyj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量处置容器 + */ + @PostMapping("/plczrq") + @RequiresPermissions("business:resource:gyzj:czrq") + public AjaxResult plczrq(@RequestBody PlczrqForm form) + { + form.setClrId(SecurityUtils.getUserId()); + gyzjService.plczrq(form); + return AjaxResult.success("操作成功"); + } + + /** + * 处置容器 + */ + @PostMapping("/czrq") + @RequiresPermissions("business:resource:gyzj:czrq") + public AjaxResult czrq(@RequestBody CzrqForm form) + { + form.setClrId(SecurityUtils.getUserId()); + gyzjService.czrq(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 钥匙发放 + */ + @PostMapping("ysff") + @RequiresPermissions("business:resource:gyzj:ysff") + public AjaxResult ysff(@RequestBody YsffForm form) + { + form.setFfrId(SecurityUtils.getUserId()); + gyzjService.ysff(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 发放 + */ + @PostMapping("ff") + @RequiresPermissions("business:resource:gyzj:ff") + public AjaxResult ff(@RequestBody FfForm form) + { + gyzjService.ff(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量发放 + */ + @PostMapping("plff") + @RequiresPermissions("business:resource:gyzj:ff") + public AjaxResult plff(@RequestBody PlffForm form) + { + gyzjService.plff(form); + return AjaxResult.success("操作成功"); + } + + + + /** + * 编辑 + */ + @PostMapping("bj") + @RequiresPermissions("business:resource:gyzj:bj") + public AjaxResult bj(@RequestBody BjForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.bj(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 审核编辑 + */ + @PostMapping("shbj") + @RequiresPermissions("business:resource:gyzj:shbj") + public AjaxResult shbj(@RequestBody ShbjForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.shbj(form); + return AjaxResult.success("操作成功"); + } + + + + /** + * 修改库存 + */ + @PostMapping("xgkc") + @RequiresPermissions("business:resource:gyzj:xgkc") + public AjaxResult xgkc(@RequestBody XgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.xgkc(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 审核修改库存 + */ + @PostMapping("shxgkc") + @RequiresPermissions("business:resource:gyzj:shxgkc") + public AjaxResult shxgkc(@RequestBody ShxgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.shxgkc(form); + return AjaxResult.success("操作成功"); } /** - * 新增给药制剂信息 + * 归还 */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Gyzj gyzj) + @PostMapping("gh") + @RequiresPermissions("business:resource:gyzj:gh") + public AjaxResult gh(@RequestBody GhForm form) { - return toAjax(gyzjService.saveOrUpdate(gyzj)); + //todo + return AjaxResult.error("todo"); } /** - * 删除给药制剂信息 + * 借阅 */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) + @PostMapping("/jy") + @RequiresPermissions("business:resource:gyzj:jy") + public AjaxResult jy(@RequestBody JyForm form) { - return toAjax(gyzjService.removeByIds(Arrays.asList(ids))); + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.jy(form); + return AjaxResult.success("操作成功"); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java new file mode 100644 index 0000000..a10e4f9 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java @@ -0,0 +1,165 @@ +package com.hxhq.business.controller; + +import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.business.dto.gyzj.FfjlListDto; +import com.hxhq.business.form.gyzj.*; +import com.hxhq.business.service.IGyzjFfjlJcgjService; +import com.hxhq.business.service.IGyzjFfjlService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 麻精药发放记录Controller + * + * @author hxhq + * @date 2025-12-15 + */ +@RestController +@RequestMapping("/business/gyzjFfjl") +public class GyzjFfjlController extends BaseController +{ + @Autowired + private IGyzjFfjlJcgjService gyzjFfjlJcgjService; + @Autowired + private IGyzjFfjlService gyzjFfjlService; + + /** + * 列表 + */ + @GetMapping("/list") + @RequiresPermissions("business:resource:gyzj:ffjllist") + public TableDataInfo list(FfjlSearchForm form) + { + startPage(); + List list = gyzjFfjlService.queryList(form); + return getDataTable(list); + } + + /** + * 详细信息 + */ + @RequiresPermissions("business:resource:gyzj:ffjlxq") + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) + { + return AjaxResult.success(gyzjFfjlService.queryInfo(id)); + } + + /** + * 稽查轨迹列表 + */ + @RequiresPermissions("business:resource:gyzj:ffjllist") + @GetMapping("/jcgjList") + public TableDataInfo jcgjList(GyzjFfjlJcgj form) + { + startPage(); + List list = gyzjFfjlJcgjService.queryList(form); + return getDataTable(list); + } + + /** + * 解档 + */ + @PostMapping("/jd") + @RequiresPermissions("business:resource:gyzj:ffjljd") + public AjaxResult jd(@RequestBody FfjlJdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + @RequiresPermissions("business:resource:gyzj:ffjlgd") + public AjaxResult plgd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + @RequiresPermissions("business:resource:gyzj:ffjlgd") + public AjaxResult gd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.gd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + @RequiresPermissions("business:resource:gyzj:ffjlsd") + public AjaxResult plsd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + @RequiresPermissions("business:resource:gyzj:ffjlsd") + public AjaxResult sd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.sd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 解锁 + */ + @PostMapping("/js") + @RequiresPermissions("business:resource:gyzj:ffjljs") + public AjaxResult js(@RequestBody FfjlJsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.js(form); + return AjaxResult.success("操作成功"); + } + + /** + * 借阅 + */ + @PostMapping("/jy") + @RequiresPermissions("business:resource:gyzj:ffjljy") + public AjaxResult jy(@RequestBody FfjlJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.jy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 加签 + */ + @PostMapping("/jq") + @RequiresPermissions("business:resource:gyzj:ffjljq") + public AjaxResult jq(@RequestBody FfjlJqForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlService.jq(form); + return AjaxResult.success("操作成功"); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java index fe09eb2..3e6e227 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java @@ -4,7 +4,7 @@ import java.util.List; import com.hxhq.business.domain.MjyJcgj; import com.hxhq.business.domain.MjyTz; -import com.hxhq.business.dto.mjy.MjyListDto; +import com.hxhq.business.dto.mjy.ListDto; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.IMjyJcgjService; import com.hxhq.business.service.IMjyTzService; @@ -43,7 +43,7 @@ public class MjyController extends BaseController public TableDataInfo list(SearchForm form) { startPage(); - List list = mjyService.queryList(form); + List list = mjyService.queryList(form); return getDataTable(list); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java index a541858..36fc5a9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java @@ -1,8 +1,7 @@ package com.hxhq.business.controller; import com.hxhq.business.domain.MjyFfjlJcgj; -import com.hxhq.business.domain.MjyJcgj; -import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.dto.mjy.FfjlListDto; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.IMjyFfjlJcgjService; import com.hxhq.business.service.IMjyFfjlService; @@ -40,7 +39,7 @@ public class MjyFfjlController extends BaseController public TableDataInfo list(FfjlSearchForm form) { startPage(); - List list = mjyFfjlService.queryList(form); + List list = mjyFfjlService.queryList(form); return getDataTable(list); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index 032a5b1..8f7d85a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -1,8 +1,12 @@ package com.hxhq.business.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.annotation.Excel; import com.hxhq.common.core.domain.MpBaseEntity; import io.swagger.v3.oas.models.security.SecurityScheme; @@ -16,184 +20,576 @@ import io.swagger.v3.oas.models.security.SecurityScheme; @TableName("t_gyzj") public class Gyzj extends MpBaseEntity { + private static final long serialVersionUID = 1L; /** 名称 */ + @Excel(name = "名称") private String mc; /** 编号 */ private String bh; /** 浓度 */ + @Excel(name = "浓度") private String nd; /** 浓度单位 */ + @Excel(name = "浓度单位") private String nddw; /** 库存 */ + @Excel(name = "库存") private String kc; /** 库存单位 */ + @Excel(name = "库存单位") private String kcdw; /** 失效日期 */ + @Excel(name = "失效日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ private Integer zjzt; - /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + /** 借阅状态：1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; - /** 关联钥匙 */ + /** 编辑状态：1:未编辑 3:审核中 */ + private Integer bjzt; + + /** 库存编辑状态：1:未编辑 3:审核中 */ + private Integer kcbjzt; + + /** 容器状态：1:未处置 3:已处置 */ + private Integer rqzt; + + /** 关联暂存柜id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Long zcgId; /** 存储条件 */ + @Excel(name = "存储条件") private String cctj; /** 存储位置 */ + @Excel(name = "存储位置") private String ccwz; /** 表单id */ private Long bdId; - /** 试验id */ - private Long syId; + /** 目的id */ + private Long mdId; + /** 名称编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String mcbj; - public void setMc(String mc) - { - this.mc = mc; + /** 浓度编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String ndbj; + + /** 浓度单位编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String nddwbj; + + /** 库存编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbj; + + /** 库存单位编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcdwbj; + + /** 失效日期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Date sxrqbj; + + /** 存储条件编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String cctjbj; + + /** 存储位置编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String ccwzbj; + + /** 编辑备注 */ + @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 ckl; + + /** 出库量单位 */ + private String ckldw; + + /** 发放转移条件 */ + private String ffzytj; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人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; + + /** 借阅开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + 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; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public String getCkl() { + return ckl; + } + + public void setCkl(String ckl) { + this.ckl = ckl; + } + + public String getCkldw() { + return ckldw; + } + + public void setCkldw(String ckldw) { + this.ckldw = ckldw; + } + + public String getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + 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 String getMc() - { + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + + public String getFfbz() { + return ffbz; + } + + public void setFfbz(String ffbz) { + this.ffbz = ffbz; + } + + public Long getMdId() { + return mdId; + } + + public void setMdId(Long mdId) { + this.mdId = mdId; + } + + 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 getMc() { return mc; } - public void setBh(String bh) - { - this.bh = bh; + public void setMc(String mc) { + this.mc = mc; } - public String getBh() - { + public String getBh() { return bh; } - public void setNd(String nd) - { - this.nd = nd; + public void setBh(String bh) { + this.bh = bh; } - public String getNd() - { + public String getNd() { return nd; } - public void setNddw(String nddw) - { - this.nddw = nddw; + public void setNd(String nd) { + this.nd = nd; } - public String getNddw() - { + public String getNddw() { return nddw; } - public void setKc(String kc) - { - this.kc = kc; + public void setNddw(String nddw) { + this.nddw = nddw; } - public String getKc() - { + public String getKc() { return kc; } - public void setKcdw(String kcdw) - { - this.kcdw = kcdw; + public void setKc(String kc) { + this.kc = kc; } - public String getKcdw() - { + public String getKcdw() { return kcdw; } - public void setSxrq(Date sxrq) - { - this.sxrq = sxrq; + public void setKcdw(String kcdw) { + this.kcdw = kcdw; } - public Date getSxrq() - { + public Date getSxrq() { return sxrq; } - public Integer getZjzt() { return zjzt; } + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } - public void setZjzt(Integer zjzt) { this.zjzt = zjzt; } + public Integer getZjzt() { + return zjzt; + } - public void setJyzt(Integer jyzt) - { - this.jyzt = jyzt; + public void setZjzt(Integer zjzt) { + this.zjzt = zjzt; } - public Integer getJyzt() - { + public Integer getJyzt() { return jyzt; } - public void setZcgId(Long zcgId) - { - this.zcgId = zcgId; + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; } - public Long getZcgId() - { + 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 Integer getRqzt() { + return rqzt; + } + + public void setRqzt(Integer rqzt) { + this.rqzt = rqzt; + } + + public Long getZcgId() { return zcgId; } - public void setCctj(String cctj) - { - this.cctj = cctj; + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; } - public String getCctj() - { + public String getCctj() { return cctj; } - public void setCcwz(String ccwz) - { - this.ccwz = ccwz; + public void setCctj(String cctj) { + this.cctj = cctj; } - public String getCcwz() - { + public String getCcwz() { return ccwz; } - public void setBdId(Long bdId) - { - this.bdId = bdId; + public void setCcwz(String ccwz) { + this.ccwz = ccwz; } - public Long getBdId() - { + public Long getBdId() { return bdId; } - public void setSyId(Long syId) - { - this.syId = syId; + public void setBdId(Long bdId) { + this.bdId = bdId; + } + + + + public String getMcbj() { + return mcbj; + } + + public void setMcbj(String mcbj) { + this.mcbj = mcbj; + } + + public String getNdbj() { + return ndbj; + } + + public void setNdbj(String ndbj) { + this.ndbj = ndbj; + } + + public String getNddwbj() { + return nddwbj; + } + + public void setNddwbj(String nddwbj) { + this.nddwbj = nddwbj; } - public Long getSyId() - { - return syId; + 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 Date getSxrqbj() { + return sxrqbj; + } + + public void setSxrqbj(Date sxrqbj) { + this.sxrqbj = sxrqbj; + } + + public String getCctjbj() { + return cctjbj; + } + + public void setCctjbj(String cctjbj) { + this.cctjbj = cctjbj; + } + + public String getCcwzbj() { + return ccwzbj; + } + + public void setCcwzbj(String ccwzbj) { + this.ccwzbj = ccwzbj; + } + + 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; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index ad35c06..9e2bd6f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -23,8 +23,8 @@ public class GyzjFfjl extends MpBaseEntity /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; - /** 麻精药id */ - private Long mjyId; + /** 给药制剂id */ + private Long gyzjId; /** 名称 */ private String mc; @@ -48,9 +48,6 @@ public class GyzjFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; - /** 保存条件 */ - private String bctj; - /** 出库量 */ private String ckl; @@ -90,13 +87,16 @@ public class GyzjFfjl extends MpBaseEntity /** 发放人2名称 */ private String ffr2Mc; - /** 领取日期 */ + /** 发放日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date lqrq; + private Date ffrq; /** 发放备注 */ private String ffbz; + /** 目的ids */ + private String mdIds; + /** 归还转移条件 */ private String ghzytj; @@ -130,9 +130,9 @@ public class GyzjFfjl extends MpBaseEntity /** 接收人2名称 */ private String jsr2Mc; - /** 接收日期 */ + /** 归还日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date jsrq; + private Date ghrq; /** 归还备注 */ private String ghbz; @@ -149,6 +149,38 @@ public class GyzjFfjl extends MpBaseEntity /** 暂存柜id */ private Long zcgId; + /** 借阅开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + 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; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + public String getSyl() { return syl; } @@ -269,30 +301,34 @@ public class GyzjFfjl extends MpBaseEntity this.jsr2Id = jsr2Id; } - public Integer getJlzt() { - return jlzt; - } - - public void setJlzt(Integer jlzt) { + public void setJlzt(Integer jlzt) + { this.jlzt = jlzt; } - public Integer getJyzt() { - return jyzt; + public Integer getJlzt() + { + return jlzt; } - public void setJyzt(Integer jyzt) { + public void setJyzt(Integer jyzt) + { this.jyzt = jyzt; } - public void setMjyId(Long mjyId) + public Integer getJyzt() + { + return jyzt; + } + + public void setGyzjId(Long gyzjId) { - this.mjyId = mjyId; + this.gyzjId = gyzjId; } - public Long getMjyId() + public Long getGyzjId() { - return mjyId; + return gyzjId; } public void setMc(String mc) @@ -363,15 +399,6 @@ public class GyzjFfjl extends MpBaseEntity this.sxrq = sxrq; } - public void setBctj(String bctj) - { - this.bctj = bctj; - } - - public String getBctj() - { - return bctj; - } public void setCkl(String ckl) { @@ -444,15 +471,6 @@ public class GyzjFfjl extends MpBaseEntity } - public void setLqrq(Date lqrq) - { - this.lqrq = lqrq; - } - - public Date getLqrq() - { - return lqrq; - } public void setFfbz(String ffbz) { @@ -514,15 +532,20 @@ public class GyzjFfjl extends MpBaseEntity return ghr2Id; } + public Date getFfrq() { + return ffrq; + } - public void setJsrq(Date jsrq) - { - this.jsrq = jsrq; + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; } - public Date getJsrq() - { - return jsrq; + public Date getGhrq() { + return ghrq; + } + + public void setGhrq(Date ghrq) { + this.ghrq = ghrq; } public void setGhbz(String ghbz) @@ -545,4 +568,4 @@ public class GyzjFfjl extends MpBaseEntity return gdsqrId; } -} +} \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java new file mode 100644 index 0000000..9baad9c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java @@ -0,0 +1,94 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 麻精药发放记录-稽查轨迹对象 t_mjy_ffjl_jcgj + * + * @author hxhq + * @date 2025-12-25 + */ +@TableName("t_mjy_ffjl_jcgj") +public class GyzjFfjlJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 发放记录id */ + private Long ffjlId; + + /** 稽查轨迹类型:1:流程；3：编辑 */ + private Integer jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Integer jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人名称 */ + private String qmrMc; + + public Long getFfjlId() { + return ffjlId; + } + + public void setFfjlId(Long ffjlId) { + this.ffjlId = ffjlId; + } + + public Integer getJcgjlx() { + return jcgjlx; + } + + public void setJcgjlx(Integer jcgjlx) { + this.jcgjlx = jcgjlx; + } + + public String getJcmc() { + return jcmc; + } + + public void setJcmc(String jcmc) { + this.jcmc = jcmc; + } + + public Integer getJcmcys() { + return jcmcys; + } + + public void setJcmcys(Integer jcmcys) { + this.jcmcys = jcmcys; + } + + public String getJcnr() { + return jcnr; + } + + public void setJcnr(String jcnr) { + this.jcnr = jcnr; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrMc() { + return qmrMc; + } + + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java index e8a9d3e..44c6f5c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java @@ -31,11 +31,11 @@ public class GyzjJcgj extends MpBaseEntity /** 稽查内容 */ private String jcnr; - /** 稽查人id */ - private Long jcrId; + /** 签名人id */ + private Long qmrId; - /** 稽查人名称 */ - private String jcrMc; + /** 签名人名称 */ + private String qmrMc; public Long getGyzjId() { return gyzjId; @@ -77,19 +77,19 @@ public class GyzjJcgj extends MpBaseEntity this.jcnr = jcnr; } - public Long getJcrId() { - return jcrId; + public Long getQmrId() { + return qmrId; } - public void setQmrId(Long jcrId) { - this.jcrId = jcrId; + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; } - public String getJcrMc() { - return jcrMc; + public String getQmrMc() { + return qmrMc; } - public void setQmrMc(String jcrMc) { - this.jcrMc = jcrMc; + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java index d4d575a..89d2535 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java @@ -15,7 +15,7 @@ public class GyzjTz extends MpBaseEntity { private static final long serialVersionUID = 1L; - /** 给药制剂id */ + /** 麻精药id */ private Long gyzjId; /** 领取人名称 */ @@ -30,23 +30,20 @@ public class GyzjTz extends MpBaseEntity /** 接收人名称 */ private String jsrMc; - /** 操作量 */ - private String czl; + /** 签名人id */ + private Long qmrId; - /** 操作量单位 */ - private String czldw; + /** 签名人名称 */ + private String qmrMc; /** 签名意义 */ private String qmyy; - /** 签名人名称 */ - private String qmrMc; - - /** 签名人id */ - private String qmrId; + /** 操作量 */ + private String czl; - /** 备注 */ - private String remark; + /** 操作量单位 */ + private String czldw; public Long getGyzjId() { return gyzjId; @@ -88,20 +85,20 @@ public class GyzjTz extends MpBaseEntity this.jsrMc = jsrMc; } - public String getCzl() { - return czl; + public Long getQmrId() { + return qmrId; } - public void setCzl(String czl) { - this.czl = czl; + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; } - public String getCzldw() { - return czldw; + public String getQmrMc() { + return qmrMc; } - public void setCzldw(String czldw) { - this.czldw = czldw; + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; } public String getQmyy() { @@ -112,29 +109,19 @@ public class GyzjTz extends MpBaseEntity this.qmyy = qmyy; } - public String getQmrMc() { - return qmrMc; - } - - public void setQmrMc(String qmrMc) { - this.qmrMc = qmrMc; - } - - public String getQmrId() { - return qmrId; + public String getCzl() { + return czl; } - public void setQmrId(String qmrId) { - this.qmrId = qmrId; + public void setCzl(String czl) { + this.czl = czl; } - @Override - public String getRemark() { - return remark; + public String getCzldw() { + return czldw; } - @Override - public void setRemark(String remark) { - this.remark = remark; + public void setCzldw(String czldw) { + this.czldw = czldw; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/DetailDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/DetailDto.java new file mode 100644 index 0000000..7fad0ee --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/DetailDto.java @@ -0,0 +1,42 @@ +package com.hxhq.business.dto.gyzj; + +import com.hxhq.business.domain.Gyzj; + +/** + * @author 15881 + */ +public class DetailDto extends Gyzj { + + /** 表单名称 */ + private String bdMc; + + /** 项目名称 */ + private String xmMc; + + /** 表单所属人名称 */ + private String bdssrMc; + + public String getBdMc() { + return bdMc; + } + + public void setBdMc(String bdMc) { + this.bdMc = bdMc; + } + + public String getXmMc() { + return xmMc; + } + + public void setXmMc(String xmMc) { + this.xmMc = xmMc; + } + + public String getBdssrMc() { + return bdssrMc; + } + + public void setBdssrMc(String bdssrMc) { + this.bdssrMc = bdssrMc; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java new file mode 100644 index 0000000..023c1e8 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java @@ -0,0 +1,11 @@ +package com.hxhq.business.dto.gyzj; + +import com.hxhq.business.domain.GyzjFfjl; + +/** + * @author 15881 + */ +public class FfjlDetailDto extends GyzjFfjl { + + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java new file mode 100644 index 0000000..c8d12c7 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java @@ -0,0 +1,254 @@ +package com.hxhq.business.dto.gyzj; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class FfjlListDto { + /** id */ + private Long id; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 发放转移条件 */ + private String ffzytj; + + /** 发放日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ffrq; + + /** 归还日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ghrq; + + /** 出库量 */ + private String ckl; + + /** 出库量单位 */ + private String ckldw; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 暂存柜名称 */ + private String zcgMc; + + /** 目的名称 */ + private String mdMc; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Long jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Long jyzt; + + public String getMdMc() { + return mdMc; + } + + public void setMdMc(String mdMc) { + this.mdMc = mdMc; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + 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 getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public Date getGhrq() { + return ghrq; + } + + public void setGhrq(Date ghrq) { + this.ghrq = ghrq; + } + + public String getCkl() { + return ckl; + } + + public void setCkl(String ckl) { + this.ckl = ckl; + } + + public String getCkldw() { + return ckldw; + } + + public void setCkldw(String ckldw) { + this.ckldw = ckldw; + } + + public String getRkl() { + return rkl; + } + + public void setRkl(String rkl) { + this.rkl = rkl; + } + + public String getRkldw() { + return rkldw; + } + + public void setRkldw(String rkldw) { + this.rkldw = rkldw; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + 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 String getSyl() { + return syl; + } + + public void setSyl(String syl) { + this.syl = syl; + } + + public String getSyldw() { + return syldw; + } + + public void setSyldw(String syldw) { + this.syldw = syldw; + } + + public String getZcgMc() { + return zcgMc; + } + + public void setZcgMc(String zcgMc) { + this.zcgMc = zcgMc; + } + + public Long getJlzt() { + return jlzt; + } + + public void setJlzt(Long jlzt) { + this.jlzt = jlzt; + } + + public Long getJyzt() { + return jyzt; + } + + public void setJyzt(Long jyzt) { + this.jyzt = jyzt; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java new file mode 100644 index 0000000..69d7dde --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java @@ -0,0 +1,320 @@ +package com.hxhq.business.dto.gyzj; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class ListDto { + /** id */ + private Long id; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 浓度 */ + private String nd; + + /** 浓度单位 */ + private String nddw; + + /** 库存 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 失效日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrq; + + /** 制剂状态：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; + + /** 容器状态：1:未处置 3:已处置 */ + private Integer rqzt; + + /** 暂存柜 */ + private String zcgMc; + + /** 存储条件 */ + private String cctj; + + /** 存储位置 */ + private String ccwz; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 出库量 */ + private String ckl; + + /** 出库量单位 */ + private String ckldw; + + /** 发放转移条件 */ + private String ffzytj; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 发放备注 */ + private String ffbz; + + /** 目的名称*/ + private String mdMc; + + public String getCkl() { + return ckl; + } + + public void setCkl(String ckl) { + this.ckl = ckl; + } + + public String getCkldw() { + return ckldw; + } + + public void setCkldw(String ckldw) { + this.ckldw = ckldw; + } + + public String getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + 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 String getFfbz() { + return ffbz; + } + + public void setFfbz(String ffbz) { + this.ffbz = ffbz; + } + + public String getMdMc() { + return mdMc; + } + + public void setMdMc(String mdMc) { + this.mdMc = mdMc; + } + + public Integer getRqzt() { + return rqzt; + } + + public void setRqzt(Integer rqzt) { + this.rqzt = rqzt; + } + + 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 Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + 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 getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + 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 getSxrq() { + return sxrq; + } + + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } + + 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 getZcgMc() { + return zcgMc; + } + + public void setZcgMc(String zcgMc) { + this.zcgMc = zcgMc; + } + + public String getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getCcwz() { + return ccwz; + } + + public void setCcwz(String ccwz) { + this.ccwz = ccwz; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyDetailDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/DetailDto.java similarity index 94% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyDetailDto.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/DetailDto.java index 862ba16..f95689a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyDetailDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/DetailDto.java @@ -8,7 +8,7 @@ import java.util.Date; /** * @author 15881 */ -public class MjyDetailDto extends Mjy { +public class DetailDto extends Mjy { /** 表单名称 */ private String bdMc; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlDetailDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlDetailDto.java similarity index 75% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlDetailDto.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlDetailDto.java index 4a68824..dacde8e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlDetailDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlDetailDto.java @@ -6,7 +6,7 @@ import com.hxhq.business.domain.MjyFfjl; /** * @author 15881 */ -public class MjyFfjlDetailDto extends MjyFfjl { +public class FfjlDetailDto extends MjyFfjl { } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java similarity index 99% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java index cc9ee1b..d6b357d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java @@ -7,7 +7,7 @@ import java.util.Date; /** * @author 15881 */ -public class MjyFfjlListDto { +public class FfjlListDto { /** id */ private Long id; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java similarity index 99% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java index cda7e31..97d24b8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java @@ -7,7 +7,7 @@ import java.util.Date; /** * @author 15881 */ -public class MjyListDto { +public class ListDto { /** id */ private Long id; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java new file mode 100644 index 0000000..33b6df6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java @@ -0,0 +1,164 @@ +package com.hxhq.business.form.gyzj; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.common.core.annotation.Excel; + +import java.util.Date; + +/** + * @author 15881 + */ +public class BjForm { + + /** 麻精药id */ + private Long id; + + /** 名称编辑 */ + @Excel(name = "名称") + private String mc; + + /** 浓度编辑 */ + @Excel(name = "浓度") + private String nd; + + /** 浓度单位编辑 */ + @Excel(name = "浓度单位") + private String nddw; + + /** 库存编辑 */ + @Excel(name = "库存") + private String kc; + + /** 库存单位编辑 */ + @Excel(name = "库存单位") + private String kcdw; + + /** 失效日期编辑 */ + @Excel(name = "失效日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrq; + + /** 存储条件编辑 */ + @Excel(name = "存储条件") + private String cctj; + + /** 存储位置编辑 */ + @Excel(name = "存储位置") + private String ccwz; + + /** 编辑备注 */ + private String bjbz; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 项目id */ + private Long xmId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + 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 getSxrq() { + return sxrq; + } + + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } + + public String getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getCcwz() { + return ccwz; + } + + public void setCcwz(String ccwz) { + this.ccwz = ccwz; + } + + public String getBjbz() { + return bjbz; + } + + public void setBjbz(String bjbz) { + this.bjbz = bjbz; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public Long getXmId() { + return xmId; + } + + public void setXmId(Long xmId) { + this.xmId = xmId; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java new file mode 100644 index 0000000..0f4ebec --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class CzrqForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java new file mode 100644 index 0000000..ac9a8ee --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java @@ -0,0 +1,117 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class CzyjForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置量 */ + private String czl; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public String getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java new file mode 100644 index 0000000..34b7ef6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java @@ -0,0 +1,161 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 目的ids */ + private String mdIds; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + 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 String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlGdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlGdForm.java new file mode 100644 index 0000000..dbc820c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlGdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlGdForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJdForm.java new file mode 100644 index 0000000..beae631 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJdForm.java @@ -0,0 +1,52 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlJdForm { + + /** 发放记录id */ + private Long id; + + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java new file mode 100644 index 0000000..8c3a022 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java @@ -0,0 +1,52 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlJqForm { + + /** 发放记录id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJsForm.java new file mode 100644 index 0000000..40db9fc --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJsForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlJsForm { + + /** 发放记录id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJyForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJyForm.java new file mode 100644 index 0000000..998d623 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJyForm.java @@ -0,0 +1,79 @@ +package com.hxhq.business.form.gyzj; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class FfjlJyForm { + + /** 发放记录id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 日期开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + /** 日期结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSdForm.java new file mode 100644 index 0000000..5aef491 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlSdForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java new file mode 100644 index 0000000..a54735d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class FfjlSearchForm { + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 入库日期开始 */ + private String startDateRk; + + /** 入库日期结束 */ + private String endDateRk; + + /** 出库日期开始 */ + private String startDateCk; + + /** 出库日期结束 */ + private String endDateCk; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 目的id */ + private Long mdId; + + 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 getStartDateRk() { + return startDateRk; + } + + public void setStartDateRk(String startDateRk) { + this.startDateRk = startDateRk; + } + + public String getEndDateRk() { + return endDateRk; + } + + public void setEndDateRk(String endDateRk) { + this.endDateRk = endDateRk; + } + + public String getStartDateCk() { + return startDateCk; + } + + public void setStartDateCk(String startDateCk) { + this.startDateCk = startDateCk; + } + + public String getEndDateCk() { + return endDateCk; + } + + public void setEndDateCk(String endDateCk) { + this.endDateCk = endDateCk; + } + + public Integer getJlzt() { + return jlzt; + } + + public void setJlzt(Integer jlzt) { + this.jlzt = jlzt; + } + + public Integer getJyzt() { + return jyzt; + } + + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; + } + + public Long getMdId() { + return mdId; + } + + public void setMdId(Long mdId) { + this.mdId = mdId; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java new file mode 100644 index 0000000..0c1335d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class GdForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java new file mode 100644 index 0000000..498cd30 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class GhForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java new file mode 100644 index 0000000..4929773 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class JdForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java new file mode 100644 index 0000000..0f47cfb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class JsForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java new file mode 100644 index 0000000..bf6966d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java @@ -0,0 +1,79 @@ +package com.hxhq.business.form.gyzj; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class JyForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 日期开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + /** 日期结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java new file mode 100644 index 0000000..4515aaf --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java @@ -0,0 +1,99 @@ +package com.hxhq.business.form.gyzj; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlczrqForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java new file mode 100644 index 0000000..f39e98b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java @@ -0,0 +1,40 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class PlczrqItem { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java new file mode 100644 index 0000000..47f4ce2 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java @@ -0,0 +1,97 @@ +package com.hxhq.business.form.gyzj; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlczyjForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java new file mode 100644 index 0000000..28058fb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class PlczyjItem { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置量 */ + private String czl; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public String getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java new file mode 100644 index 0000000..f64b493 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java @@ -0,0 +1,119 @@ +package com.hxhq.business.form.gyzj; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlffForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + 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 String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java new file mode 100644 index 0000000..9b0da50 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java @@ -0,0 +1,75 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class PlffItem { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 目的ids */ + private String mdIds; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java new file mode 100644 index 0000000..7f48f96 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class SdForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java new file mode 100644 index 0000000..e09015b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java @@ -0,0 +1,73 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class SearchForm { + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 失效日期开始 */ + private String startDate; + + /** 失效日期结束 */ + private String endDate; + + /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ + private Integer zjzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + 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 getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + 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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java new file mode 100644 index 0000000..0a705c0 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class ShbjForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private String qmyy; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java new file mode 100644 index 0000000..7115194 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java @@ -0,0 +1,86 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class ShxgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存编辑 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private String qmyy; + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + 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 String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java new file mode 100644 index 0000000..7464a00 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java @@ -0,0 +1,77 @@ +package com.hxhq.business.form.gyzj; + +import com.hxhq.common.core.annotation.Excel; + +/** + * @author 15881 + */ +public class XgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存 */ + @Excel(name = "库存") + private String kc;; + + /** 库存单位 */ + @Excel(name = "库存单位") + private String kcdw; + + /** 库存编辑备注 */ + private String kcbjbz; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + 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 String getKcbjbz() { + return kcbjbz; + } + + public void setKcbjbz(String kcbjbz) { + this.kcbjbz = kcbjbz; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java new file mode 100644 index 0000000..026ac0d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java @@ -0,0 +1,117 @@ +package com.hxhq.business.form.gyzj; + +/** + * @author 15881 + */ +public class YsffForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 暂存柜id */ + private Long zcgId; + + /** 备注 */ + private String remark; + + /** 钥匙1领取人ID */ + private Long lqr1Id; + + /** 钥匙2领取人ID */ + private Long lqr2Id; + + /** 钥匙1领取人密码 */ + private String lqr1mm; + + /** 钥匙2领取人密码 */ + private String lqr2mm; + + /** 发放人 */ + private Long ffrId; + + /** 发放人密码 */ + private String ffrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getZcgId() { + return zcgId; + } + + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + 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 String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfrId() { + return ffrId; + } + + public void setFfrId(Long ffrId) { + this.ffrId = ffrId; + } + + public String getFfrmm() { + return ffrmm; + } + + public void setFfrmm(String ffrmm) { + this.ffrmm = ffrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlJcgjMapper.java new file mode 100644 index 0000000..3ad7d81 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlJcgjMapper.java @@ -0,0 +1,15 @@ +package com.hxhq.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hxhq.business.domain.GyzjFfjlJcgj; + +/** + * 给药制剂发放记录-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-25 + */ +public interface GyzjFfjlJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java index ff7029f..70c706b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java @@ -1,7 +1,14 @@ package com.hxhq.business.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.hxhq.business.domain.GyzjFfjl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hxhq.business.dto.gyzj.FfjlDetailDto; +import com.hxhq.business.dto.gyzj.FfjlListDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * 给药制剂-发放记录Mapper接口 * @@ -10,5 +17,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface GyzjFfjlMapper extends BaseMapper { + /** + * 查询列表 + * @param queryWrapper + * @return + */ + List queryList(@Param("ew") Wrapper queryWrapper); + /** + * 查询详情 + * @param id + * @return + */ + FfjlDetailDto queryInfo(@Param("id") Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java index a7f684b..a36942e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java @@ -1,7 +1,14 @@ package com.hxhq.business.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.hxhq.business.domain.Gyzj; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hxhq.business.dto.gyzj.DetailDto; +import com.hxhq.business.dto.gyzj.ListDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * 给药制剂Mapper接口 * @@ -10,5 +17,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface GyzjMapper extends BaseMapper { + /** + * 查询列表 + * @param queryWrapper + * @return + */ + List queryList(@Param("ew") Wrapper queryWrapper); + + /** + * 查询详情 + * @param id + * @return + */ + DetailDto queryInfo(@Param("id") Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java index 9bc3763..dfd1ded 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java @@ -1,13 +1,10 @@ package com.hxhq.business.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.hxhq.business.domain.Mjy; import com.hxhq.business.domain.MjyFfjl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hxhq.business.dto.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlListDto; -import com.hxhq.business.dto.mjy.MjyListDto; +import com.hxhq.business.dto.mjy.FfjlDetailDto; +import com.hxhq.business.dto.mjy.FfjlListDto; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,12 +22,12 @@ public interface MjyFfjlMapper extends BaseMapper * @param queryWrapper * @return */ - List queryList(@Param("ew") Wrapper queryWrapper); + List queryList(@Param("ew") Wrapper queryWrapper); /** * 查询详情 * @param id * @return */ - MjyFfjlDetailDto queryInfo(@Param("id") Long id); + FfjlDetailDto queryInfo(@Param("id") Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java index 70053d8..f4ef11c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java @@ -3,8 +3,8 @@ package com.hxhq.business.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.hxhq.business.domain.Mjy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hxhq.business.dto.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyListDto; +import com.hxhq.business.dto.mjy.DetailDto; +import com.hxhq.business.dto.mjy.ListDto; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,13 +22,13 @@ public interface MjyMapper extends BaseMapper * @param queryWrapper * @return */ - List queryList(@Param("ew") Wrapper queryWrapper); + List queryList(@Param("ew") Wrapper queryWrapper); /** * 查询详情 * @param id * @return */ - MjyDetailDto queryInfo(@Param("id") Long id); + DetailDto queryInfo(@Param("id") Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java new file mode 100644 index 0000000..24382d1 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java @@ -0,0 +1,35 @@ +package com.hxhq.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.GyzjFfjlJcgj; + +import java.util.List; + +/** + * 给药制剂发放记录-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-25 + */ +public interface IGyzjFfjlJcgjService extends IService +{ + + /** + * 查询稽查轨迹列表 + * @param gyzjJcgj 麻精药 + * @return + */ + public List queryList(GyzjFfjlJcgj gyzjJcgj); + + /** + * 新增稽查轨迹 + * @param ffjlId 发放记录id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 7960f81..047be51 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -3,9 +3,13 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GyzjFfjl; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.dto.gyzj.FfjlDetailDto; +import com.hxhq.business.dto.gyzj.FfjlListDto; +import com.hxhq.business.form.gyzj.*; +import org.springframework.web.bind.annotation.RequestBody; /** - * 给药制剂-发放记录Service接口 + * 麻精药-发放记录Service接口 * * @author hxhq * @date 2025-12-21 @@ -13,11 +17,77 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IGyzjFfjlService extends IService { /** - * 查询给药制剂-发放记录列表 + * 列表 * - * @param gyzjFfjl 给药制剂-发放记录 - * @return 给药制剂-发放记录集合 + * @param form 麻精药-发放记录 + * @return */ - public List queryList(GyzjFfjl gyzjFfjl); + public List queryList(FfjlSearchForm form); + /** + * 详情 + * + * @param id + * @return + */ + public FfjlDetailDto queryInfo(Long id); + + /** + * 解档 + * + * @param form + */ + public void jd(@RequestBody FfjlJdForm form); + + /** + * 批量归档 + * + * @param form + */ + public void plgd(@RequestBody FfjlGdForm form); + + /** + * 归档 + * + * @param form + */ + public void gd(@RequestBody FfjlGdForm form); + + + /** + * 批量锁定 + * + * @param form + */ + public void plsd(@RequestBody FfjlSdForm form); + + /** + * 锁定 + * + * @param form + */ + public void sd(@RequestBody FfjlSdForm form); + + /** + * 解锁 + * + * @param form + */ + public void js(@RequestBody FfjlJsForm form); + + + /** + * 借阅 + * + * @param form + */ + public void jy(@RequestBody FfjlJyForm form); + + + /** + * 加签 + * + * @param form + */ + public void jq(@RequestBody FfjlJqForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java index e9fe6af..b3ebbc8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java @@ -1,12 +1,13 @@ package com.hxhq.business.service; import java.util.List; + import com.hxhq.business.domain.GyzjJcgj; -import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.GyzjJcgj; +import com.baomidou.mybatisplus.extension.service.IService; /** - * 给药制剂-稽查轨迹Service接口 + * 麻精药-稽查轨迹Service接口 * * @author hxhq * @date 2025-12-18 @@ -15,15 +16,14 @@ public interface IGyzjJcgjService extends IService { /** * 查询稽查轨迹列表 - * @param gyzjId 给药制剂id - * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param gyzjJcgj 麻精药 * @return */ - public List queryListByGyzjId(Long gyzjId, Integer jcgjlx); + public List queryList(GyzjJcgj gyzjJcgj); /** * 新增稽查轨迹 - * @param gyzjId 麻给药制剂id + * @param gyzjId 麻精药id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 @@ -31,5 +31,6 @@ public interface IGyzjJcgjService extends IService * @param jcrId 稽查人id * @param jcrMc 稽查人名称 */ - void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java index f48992d..4af0414 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java @@ -1,8 +1,14 @@ package com.hxhq.business.service; import java.util.List; + import com.hxhq.business.domain.Gyzj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.dto.gyzj.DetailDto; +import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.form.gyzj.*; +; +import org.springframework.web.bind.annotation.RequestBody; /** * 给药制剂Service接口 @@ -15,9 +21,147 @@ public interface IGyzjService extends IService /** * 查询给药制剂列表 * - * @param gyzj 给药制剂 + * @param form 给药制剂 * @return 给药制剂集合 */ - public List queryList(Gyzj gyzj); + public List queryList(SearchForm form); + + /** + * 查询给药制剂 + * + * @param id + * @return 给药制剂 + */ + public DetailDto queryInfo(Long id); + /** + * 解档 + * + * @param form + */ + public void jd(@RequestBody JdForm form); + + /** + * 批量归档 + * + * @param form + */ + public void plgd(@RequestBody GdForm form); + + /** + * 归档 + * + * @param form + */ + public void gd(@RequestBody GdForm form); + + + /** + * 批量锁定 + * + * @param form + */ + public void plsd(@RequestBody SdForm form); + + /** + * 锁定 + * + * @param form + */ + public void sd(@RequestBody SdForm form); + + /** + * 解锁 + * + * @param form + */ + public void js(@RequestBody JsForm form); + + /** + * 批量处置药剂 + * + * @param form + */ + public void plczyj(@RequestBody PlczyjForm form); + + /** + * 处置药剂 + * + * @param form + */ + public void czyj(@RequestBody CzyjForm form); + + /** + * 批量处置容器 + * + * @param form + */ + public void plczrq(@RequestBody PlczrqForm form); + + /** + * 处置容器 + * + * @param form + */ + public void czrq(@RequestBody CzrqForm form); + + + /** + * 钥匙发放 + * + * @param form + */ + public void ysff(@RequestBody YsffForm form); + + + /** + * 发放 + * + * @param form + */ + public void ff(@RequestBody FfForm form); + + + /** + * 批量发放 + * + * @param form + */ + public void plff(@RequestBody PlffForm form); + + /** + * 编辑 + * + * @param form + */ + public void bj(@RequestBody BjForm form); + + /** + * 审核编辑 + * + * @param form + */ + public void shbj(@RequestBody ShbjForm form); + + /** + * 修改库存 + * + * @param form + */ + public void xgkc(@RequestBody XgkcForm form); + + /** + * 审核修改库存 + * + * @param form + */ + public void shxgkc(@RequestBody ShxgkcForm form); + + + /** + * 借阅 + * + * @param form + */ + public void jy(@RequestBody JyForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java index 03fe88a..0fb9ed3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java @@ -1,6 +1,8 @@ package com.hxhq.business.service; import java.util.List; + +import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.GyzjTz; import com.baomidou.mybatisplus.extension.service.IService; @@ -12,12 +14,27 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IGyzjTzService extends IService { + /** - * 查询给药制剂-台账列表 - * - * @param gyzjTz 给药制剂-台账 - * @return 给药制剂-台账集合 + * 查询台账列表 + * @param gyzjTz 给药制剂 + * @return */ public List queryList(GyzjTz gyzjTz); + /** + * 新增台账 + * @param gyzjId 给药制剂id + * @param lqrMc 领取人名称 + * @param ghrMc 归还人名称 + * @param ffrMc 发放人名称 + * @param jsrMc 接收人名称 + * @param qmrId 签名人id + * @param qmrMc 签名人名称 + * @param qmyy 签名意义 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 + */ + public void saveTz(Long gyzjId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java index 5d058a5..8949fae 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java @@ -3,9 +3,8 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.MjyFfjl; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.dto.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.dto.mjy.FfjlDetailDto; +import com.hxhq.business.dto.mjy.FfjlListDto; import com.hxhq.business.form.mjy.*; import org.springframework.web.bind.annotation.RequestBody; @@ -23,7 +22,7 @@ public interface IMjyFfjlService extends IService * @param form 麻精药-发放记录 * @return */ - public List queryList(FfjlSearchForm form); + public List queryList(FfjlSearchForm form); /** * 详情 @@ -31,7 +30,7 @@ public interface IMjyFfjlService extends IService * @param id * @return */ - public MjyFfjlDetailDto queryInfo(Long id); + public FfjlDetailDto queryInfo(Long id); /** * 解档 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index fee0e46..984efa8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java @@ -4,8 +4,8 @@ import java.util.List; import com.hxhq.business.domain.Mjy; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.dto.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyListDto; +import com.hxhq.business.dto.mjy.DetailDto; +import com.hxhq.business.dto.mjy.ListDto; import com.hxhq.business.form.mjy.*; ; import org.springframework.web.bind.annotation.RequestBody; @@ -24,7 +24,7 @@ public interface IMjyService extends IService * @param form 麻精药 * @return 麻精药集合 */ - public List queryList(SearchForm form); + public List queryList(SearchForm form); /** * 查询麻精药 @@ -32,7 +32,7 @@ public interface IMjyService extends IService * @param id * @return 麻精药 */ - public MjyDetailDto queryInfo(Long id); + public DetailDto queryInfo(Long id); /** * 解档 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java new file mode 100644 index 0000000..6dcbaef --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java @@ -0,0 +1,70 @@ +package com.hxhq.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.business.mapper.GyzjFfjlJcgjMapper; +import com.hxhq.business.service.IGyzjFfjlJcgjService; +import com.hxhq.common.core.utils.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 麻精药发放记录-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-25 + */ +@Service +public class GyzjFfjlJcgjServiceImpl extends ServiceImpl implements IGyzjFfjlJcgjService +{ + + /** + * 查询稽查轨迹列表 + * @param gyzjFfjlJcgj 麻给药 + * @return + */ + @Override + public List queryList(GyzjFfjlJcgj gyzjFfjlJcgj){ + QueryWrapper queryWrapper = Wrappers.query(); + if(gyzjFfjlJcgj.getFfjlId()==null||gyzjFfjlJcgj.getFfjlId().longValue()<0){ + throw new SecurityException("发放记录id不能为空"); + } + queryWrapper.eq("ffjl_id",gyzjFfjlJcgj.getFfjlId()); + if(gyzjFfjlJcgj.getJcgjlx()!=null&&gyzjFfjlJcgj.getJcgjlx().intValue()>0){ + queryWrapper.eq("jcgjlx",gyzjFfjlJcgj.getJcgjlx()); + } + if (StringUtils.isNoneBlank(gyzjFfjlJcgj.getJcmc())) { + queryWrapper.and(p -> p.like("`jcmc`", gyzjFfjlJcgj.getJcmc()) + .or().like("`jcnr`", gyzjFfjlJcgj.getJcmc())); + } + queryWrapper.orderByDesc("id"); + return this.list(queryWrapper); + } + + /** + * 新增稽查轨迹 + * @param ffjlId 发放记录id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + @Override + public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); + gyzjFfjlJcgj.setFfjlId(ffjlId); + gyzjFfjlJcgj.setJcgjlx(jcgjlx); + gyzjFfjlJcgj.setJcmc(jcmc); + gyzjFfjlJcgj.setJcmcys(jcmcys); + gyzjFfjlJcgj.setJcnr(jcnr); + gyzjFfjlJcgj.setQmrId(jcrId); + gyzjFfjlJcgj.setQmrMc(jcrMc); + this.save(gyzjFfjlJcgj); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 1f9a6d5..6ea65d3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -1,16 +1,36 @@ package com.hxhq.business.service.impl; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.business.dto.gyzj.FfjlDetailDto; +import com.hxhq.business.dto.gyzj.FfjlListDto; +import com.hxhq.business.enums.zykgl.*; +import com.hxhq.business.enums.zykgl.JlztEnum; +import com.hxhq.business.form.gyzj.*; +import com.hxhq.business.service.IGyzjFfjlJcgjService; +import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjFfjlMapper; import com.hxhq.business.domain.GyzjFfjl; import com.hxhq.business.service.IGyzjFfjlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; /** - * 给药制剂-发放记录Service业务层处理 + * 发放记录-发放记录Service业务层处理 * * @author hxhq * @date 2025-12-21 @@ -18,17 +38,357 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class GyzjFfjlServiceImpl extends ServiceImpl implements IGyzjFfjlService { + @Autowired + private ISysUserService sysUserService; + @Autowired + private IGyzjFfjlJcgjService gyzjFfjlJcgjService; + /** - * 查询给药制剂-发放记录列表 + * 列表 * - * @param gyzjFfjl 给药制剂-发放记录 - * @return 给药制剂-发放记录 + * @param form 发放记录发放记录 + * @return 发放记录发放记录 */ @Override - public List queryList(GyzjFfjl gyzjFfjl) + public List queryList(FfjlSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); - return this.list(queryWrapper); + queryWrapper.eq("t.del_flag", "0"); + if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { + queryWrapper.eq("t.jyzt", form.getJyzt()); + } + if (form.getJlzt() != null && form.getJlzt().intValue() > 0) { + queryWrapper.eq("t.jlzt", form.getJlzt()); + } + 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.getStartDateCk())) { + queryWrapper.and(p->p.apply("t.ffrq>={0}", form.getStartDateCk())); + } + if (StringUtils.isNoneBlank(form.getEndDateCk())) { + queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk()); + } + if (StringUtils.isNoneBlank(form.getStartDateRk())) { + queryWrapper.and(p->p.apply("t.rkrq>={0}", form.getStartDateRk())); + } + if (StringUtils.isNoneBlank(form.getEndDateRk())) { + queryWrapper.apply("t.rkrq>={0}", form.getEndDateRk()); + } + if (form.getMdId() != null && form.getMdId().intValue() > 0) { + queryWrapper.and(p->p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + } + queryWrapper.orderByDesc("t.id"); + return baseMapper.queryList(queryWrapper); + } + + /** + * 加签 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jq(@RequestBody FfjlJqForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) { + throw new SecurityException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能加签"); + } + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "补充说明"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 借阅 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jy(@RequestBody FfjlJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) { + throw new SecurityException("发放记录【" + gyzjFfjlOld.getMc() + "】不是归档状态，不能借阅"); + } + if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.wjy.getValue())) { + throw new SecurityException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未借阅状态，不能借阅"); + } + //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； + gyzjFfjlOld.setJyzt(JyztEnum.djy.getValue()); + gyzjFfjlOld.setJyksrq(form.getStartDate()); + gyzjFfjlOld.setJyjsrq(form.getEndDate()); + this.updateById(gyzjFfjlOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); + formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请借阅"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 详情 + * + * @param id + * @return 暂存柜 + */ + @Override + public FfjlDetailDto queryInfo(Long id) { + if (id == null || id.longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + return baseMapper.queryInfo(id); + } + + /** + * 解档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jd(@RequestBody FfjlJdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) { + throw new SecurityException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】未归档，不能解档"); + } + //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作； + gyzjFfjlOld.setJlzt(JlztEnum.djd.getValue()); + this.updateById(gyzjFfjlOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请解档"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + } + + /** + * 批量归档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plgd(@RequestBody FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List gyzjFfjlList = this.list(queryWrapper); + List gyzjFfjlJcgjList = new ArrayList<>(); + if (gyzjFfjlList.size() > 0) { + for (GyzjFfjl gyzj : gyzjFfjlList) { + if (!gyzj.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("发放记录发放记录【" + gyzj.getMc() + "】不是锁定状态，不能归档"); + } + } + for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gyzjFfjl.setJlzt(JlztEnum.dgd.getValue()); + + //region 稽查轨迹 + GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); + gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId()); + gyzjFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjFfjlJcgj.setJcmc("申请归档"); + gyzjFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请归档"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjList.add(gyzjFfjlJcgj); + //endregion + + } + this.saveOrUpdateBatch(gyzjFfjlList); + gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList); + } + } + + /** + * 归档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gd(@RequestBody FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue()); + this.updateById(gyzjFfjlOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请归档"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + } + + + /** + * 批量锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plsd(@RequestBody FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("jlzt", JlztEnum.wsd.getValue()); + List gyzjFfjlList = this.list(queryWrapper); + List gyzjFfjlJcgjList = new ArrayList<>(); + if (gyzjFfjlList.size() <= 0) { + throw new SecurityException("发放记录发放记录不是未锁定状态，不能锁定"); + } + for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { + //锁定 + gyzjFfjl.setJlzt(JlztEnum.ysd.getValue()); + + //region 稽查轨迹 + GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); + gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId()); + gyzjFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjFfjlJcgj.setJcmc("锁定发放记录"); + gyzjFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定发放记录"); + formData.put("签名人", qmr.getNickName()); + + gyzjFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjList.add(gyzjFfjlJcgj); + //endregion + + } + this.saveOrUpdateBatch(gyzjFfjlList); + gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList); + + } + + /** + * 锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void sd(@RequestBody FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) { + throw new SecurityException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能锁定"); + } + gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue()); + this.updateById(gyzjFfjlOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定发放记录"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + } + + + /** + * 解锁 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void js(@RequestBody FfjlJsForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); + if (gyzjFfjlOld == null) { + throw new SecurityException("发放记录发放记录不存在或已删除"); + } + if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是已锁定状态，不能解锁"); + } + //点击解锁，状态更新为入库； + gyzjFfjlOld.setJlzt(JlztEnum.wsd.getValue()); + this.updateById(gyzjFfjlOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "解锁发放记录"); + formData.put("签名人", qmr.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index 4212e15..8d5e5ae 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -3,7 +3,9 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hxhq.business.domain.MjyJcgj; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjJcgjMapper; import com.hxhq.business.domain.GyzjJcgj; @@ -11,7 +13,7 @@ import com.hxhq.business.service.IGyzjJcgjService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * 给药制剂-稽查轨迹Service业务层处理 + * 麻精药-稽查轨迹Service业务层处理 * * @author hxhq * @date 2025-12-18 @@ -19,21 +21,25 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class GyzjJcgjServiceImpl extends ServiceImpl implements IGyzjJcgjService { + /** * 查询稽查轨迹列表 - * @param gyzjId 麻给药制剂id - * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param gyzjJcgj 麻给药 * @return */ @Override - public List queryListByGyzjId(Long gyzjId, Integer jcgjlx){ + public List queryList(GyzjJcgj gyzjJcgj){ QueryWrapper queryWrapper = Wrappers.query(); - if(gyzjId==null){ + if(gyzjJcgj.getGyzjId()==null||gyzjJcgj.getGyzjId().longValue()<0){ throw new SecurityException("麻精药id不能为空"); } - queryWrapper.eq("gyzj_id",gyzjId); - if(jcgjlx!=null&&jcgjlx.intValue()>0){ - queryWrapper.eq("jcgjlx",jcgjlx); + queryWrapper.eq("gyzj_id",gyzjJcgj.getGyzjId()); + if(gyzjJcgj.getJcgjlx()!=null&&gyzjJcgj.getJcgjlx().intValue()>0){ + queryWrapper.eq("jcgjlx",gyzjJcgj.getJcgjlx()); + } + if (StringUtils.isNoneBlank(gyzjJcgj.getJcmc())) { + queryWrapper.and(p -> p.like("`jcmc`", gyzjJcgj.getJcmc()) + .or().like("`jcnr`", gyzjJcgj.getJcmc())); } queryWrapper.orderByDesc("id"); return this.list(queryWrapper); @@ -41,7 +47,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i /** * 新增稽查轨迹 - * @param gyzjId 给药制剂id + * @param gyzjId 麻精药id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 @@ -61,4 +67,5 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i gyzjJcgj.setQmrMc(jcrMc); this.save(gyzjJcgj); } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index 064a080..c564a6f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -1,34 +1,1265 @@ package com.hxhq.business.service.impl; -import java.util.List; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + 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.gyzj.DetailDto; +import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.enums.zykgl.*; +import com.hxhq.business.form.gyzj.*; +import com.hxhq.business.service.*; +import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjMapper; import com.hxhq.business.domain.Gyzj; -import com.hxhq.business.service.IGyzjService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; /** - * 给药制剂Service业务层处理 + * 麻精药Service业务层处理 * * @author hxhq * @date 2025-12-18 */ @Service -public class GyzjServiceImpl extends ServiceImpl implements IGyzjService -{ +public class GyzjServiceImpl extends ServiceImpl implements IGyzjService { + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private ISysUserService sysUserService; + @Autowired + private IGyzjJcgjService gyzjJcgjService; + @Autowired + private IGyzjFfjlService gyzjFfjlService; + @Autowired + private IZcgService zcgService; + @Autowired + private IGyzjTzService gyzjTzService; + + /** + * 列表 + * + * @param form 暂存柜 + * @return 暂存柜 + */ + @Override + public List queryList(SearchForm form) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("t.del_flag", "0"); + 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.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("t.id"); + return baseMapper.queryList(queryWrapper); + } + + + /** + * 详情 + * + * @param id + * @return 暂存柜 + */ + @Override + public DetailDto queryInfo(Long id) { + if (id == null || id.longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + return baseMapper.queryInfo(id); + } + + /** + * 解档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jd(@RequestBody JdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】未归档，不能解档"); + } + //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； + gyzjOld.setZjzt(ZjztEnum.djd.getValue()); + this.updateById(gyzjOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请解档"); + formData.put("签名人", qmr.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 借阅 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jy(@RequestBody JyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是归档状态，不能借阅"); + } + if (!gyzjOld.getJyzt().equals(JyztEnum.wjy.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是未借阅状态，不能借阅"); + } + //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； + gyzjOld.setJyzt(JyztEnum.djy.getValue()); + gyzjOld.setJyksrq(form.getStartDate()); + gyzjOld.setJyjsrq(form.getEndDate()); + this.updateById(gyzjOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); + formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请借阅"); + formData.put("签名人", qmr.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + /** - * 查询给药制剂列表 + * 批量归档 ok * - * @param gyzj 给药制剂 - * @return 给药制剂 + * @param form */ @Override - public List queryList(Gyzj gyzj) - { + @Transactional(rollbackFor = Exception.class) + public void plgd(@RequestBody GdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } QueryWrapper queryWrapper = Wrappers.query(); - return this.list(queryWrapper); + queryWrapper.in("id", form.getIds()); + List gyzjList = this.list(queryWrapper); + List gyzjJcgjList = new ArrayList<>(); + if (gyzjList.size() > 0) { + for (Gyzj gyzj : gyzjList) { + if (!gyzj.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】不是锁定状态，不能归档"); + } + } + for (Gyzj gyzj : gyzjList) { + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gyzj.setZjzt(ZjztEnum.dgd.getValue()); + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("申请归档"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + String jcnr = "备注：" + form.getRemark() + + ";签名意义：申请归档" + + ";签名人：" + qmr.getNickName(); + gyzjJcgj.setJcnr(jcnr); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + + } + this.saveOrUpdateBatch(gyzjList); + gyzjJcgjService.saveBatch(gyzjJcgjList); + } + } + + /** + * 归档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gd(@RequestBody GdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gyzjOld.setZjzt(ZjztEnum.dgd.getValue()); + this.updateById(gyzjOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请归档"); + formData.put("签名人", qmr.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + + /** + * 批量锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plsd(@RequestBody SdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + List gyzjList = this.list(queryWrapper); + List gyzjJcgjList = new ArrayList<>(); + if (gyzjList.size() <= 0) { + throw new SecurityException("麻精药不是入库状态，不能锁定"); + } + for (Gyzj gyzj : gyzjList) { + //锁定 + gyzj.setZjzt(ZjztEnum.ysd.getValue()); + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("锁定麻精药"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定麻精药"); + formData.put("签名人", qmr.getNickName()); + + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + + } + this.saveOrUpdateBatch(gyzjList); + gyzjJcgjService.saveBatch(gyzjJcgjList); + + } + + /** + * 锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void sd(@RequestBody SdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能锁定"); + } + gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(gyzjOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定麻精药"); + formData.put("签名人", qmr.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + + /** + * 解锁 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void js(@RequestBody JsForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是已锁定状态，不能解锁"); + } + //点击解锁，状态更新为入库； + gyzjOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(gyzjOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "解锁麻精药"); + formData.put("签名人", qmr.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 批量处置药剂 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plczyj(@RequestBody PlczyjForm form) { + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + if (form.getList().size() < 0) { + throw new SecurityException("参数list不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + List gyzjList = this.list(queryWrapper); + if (gyzjList.size() <= 0) { + throw new SecurityException("麻精药不是入库状态，不能处置药剂"); + } + List gyzjJcgjList = new ArrayList<>(); + List gyzjTzList = new ArrayList<>(); + + for (Gyzj gyzj : gyzjList) { + List gyzjPlffItemFilter = form.getList().stream() + .filter(p -> p.getId().equals(gyzj.getId())) + .collect(Collectors.toList()); + if (gyzjPlffItemFilter.size() > 0) { + //region 验证 + if (StringUtils.isBlank(gyzjPlffItemFilter.get(0).getCzl())) { + throw new SecurityException("处置量不能为空"); + } + BigDecimal czl = BigDecimal.ZERO; + try { + czl = new BigDecimal(gyzjPlffItemFilter.get(0).getCzl()); + } catch (Exception ex) { + throw new SecurityException("处置量填写不正确"); + } + //验证库存 + BigDecimal kc = new BigDecimal(gyzj.getKc()); + if (kc.compareTo(BigDecimal.ZERO) <= 0) { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】库存不足，不能处置"); + } + if (kc.compareTo(czl) < 0) { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】处置量大于库存量"); + } + //更新库存 + gyzj.setKc(kc.subtract(czl).toString()); + + + //endregion + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("处置药剂"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); + formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); + formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); + + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + + //region 台账 + GyzjTz gyzjTz = new GyzjTz(); + gyzjTz.setGyzjId(gyzj.getId()); + gyzjTz.setQmyy("处置药剂"); + gyzjTz.setQmrId(clr.getUserId()); + gyzjTz.setQmrMc(clr.getNickName()); + gyzjTz.setCzl(gyzjPlffItemFilter.get(0).getCzl()); + gyzjTz.setCzldw(gyzj.getKcdw()); + gyzjTz.setRemark(gyzjPlffItemFilter.get(0).getCzyy()); + gyzjTzList.add(gyzjTz); + //endregion + + } else { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + } + } + this.saveOrUpdateBatch(gyzjList); + gyzjJcgjService.saveBatch(gyzjJcgjList); + gyzjTzService.saveBatch(gyzjTzList); + } + + + /** + * 处置药剂 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void czyj(@RequestBody CzyjForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能处置药剂"); + } + if (StringUtils.isBlank(form.getCzl())) { + throw new SecurityException("处置量不能为空"); + } + BigDecimal czl = BigDecimal.ZERO; + try { + czl = new BigDecimal(form.getCzl()); + } catch (Exception ex) { + throw new SecurityException("处置量填写不正确"); + } + //验证库存 + BigDecimal kc = new BigDecimal(gyzjOld.getKc()); + if (kc.compareTo(BigDecimal.ZERO) <= 0) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】库存不足，不能处置"); + } + if (kc.compareTo(czl) < 0) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】处置量大于库存量"); + } + //更新库存 + gyzjOld.setKc(kc.subtract(czl).toString()); + + + //region 稽查轨迹 + + Map formData = new LinkedHashMap<>(); + formData.put("处置方式", form.getCzfs()); + formData.put("处置原因", form.getCzyy()); + formData.put("处置量", form.getCzl() + gyzjOld.getKcdw()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); + + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + + //region 台账 + gyzjTzService.saveTz(gyzjOld.getId(), "", "", + "", "", clr.getUserId(), clr.getNickName(), + "处置药剂", form.getCzl(), gyzjOld.getKcdw(), form.getCzyy()); + //endregion + + this.updateById(gyzjOld); + } + + + /** + * 批量处置容器 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plczrq(@RequestBody PlczrqForm form) { + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + queryWrapper.eq("rqzt", RqztEnum.wcz.getValue()); + List gyzjList = this.list(queryWrapper); + List gyzjJcgjList = new ArrayList<>(); + List gyzjTzList = new ArrayList<>(); + + if (gyzjList.size() <= 0) { + throw new SecurityException("麻精药已经处置过容器了，不能重复操作"); + } + for (Gyzj gyzj : gyzjList) { + List gyzjPlffItemFilter = form.getList().stream() + .filter(p -> p.getId().equals(gyzj.getId())) + .collect(Collectors.toList()); + if (gyzjPlffItemFilter.size() > 0) { + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("处置容器"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + + Map formData = new LinkedHashMap<>(); + formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); + formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); + + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + + //region 台账 + GyzjTz gyzjTz = new GyzjTz(); + gyzjTz.setGyzjId(gyzj.getId()); + gyzjTz.setQmyy("处置容器"); + gyzjTz.setQmrId(clr.getUserId()); + gyzjTz.setQmrMc(clr.getNickName()); + gyzjTz.setRemark(gyzjPlffItemFilter.get(0).getCzyy()); + gyzjTzList.add(gyzjTz); + //endregion + + gyzj.setRqzt(RqztEnum.ycz.getValue()); + } else { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + } + } + + this.saveOrUpdateBatch(gyzjList); + gyzjJcgjService.saveBatch(gyzjJcgjList); + gyzjTzService.saveBatch(gyzjTzList); + } + + /** + * 处置容器 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void czrq(@RequestBody CzrqForm form) { + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能处置容器"); + } + if (!gyzjOld.getRqzt().equals(RqztEnum.wcz.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经处置过容器了，不能重复操作"); + } + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("处置方式", form.getCzfs()); + formData.put("处置原因", form.getCzyy()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); + + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + + //region 台账 + gyzjTzService.saveTz(gyzjOld.getId(), "", "", + "", "", clr.getUserId(), clr.getNickName(), + "处置容器", "", "", form.getCzyy()); + //endregion + gyzjOld.setRqzt(RqztEnum.ycz.getValue()); + this.updateById(gyzjOld); + } + + + /** + * 钥匙发放 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void ysff(@RequestBody YsffForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + if (lqr1 == null) { + throw new SecurityException("领取人1不存在"); + } + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + if (lqr2 == null) { + throw new SecurityException("领取人2不存在"); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); + if (ffr1 == null) { + throw new SecurityException("发放人不存在"); + } + //验证领取人1,领取人2,发放人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + if (form.getZcgId() == null || form.getZcgId().longValue() < 0) { + throw new SecurityException("暂存柜id不正确"); + } + Zcg zcg = zcgService.getById(form.getZcgId()); + if (zcg == null) { + throw new SecurityException("暂存柜不存在或已删除"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.isNull("zcg_id"); + List gyzjList = this.list(queryWrapper); + List gyzjJcgjList = new ArrayList<>(); + if (gyzjList.size() <= 0) { + throw new SecurityException("药剂已被发放,请不要重复发放"); + } + String glyj = ""; + for (Gyzj gyzj : gyzjList) { + //更新暂存柜id + gyzj.setZcgId(zcg.getId()); + //更新暂存柜关联药剂 + if (StringUtils.isBlank(glyj)) { + glyj += gyzj.getMc(); + } else { + glyj += "," + gyzj.getMc(); + } + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("钥匙发放"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("钥匙1领取人", lqr1.getNickName()); + formData.put("钥匙2领取人", lqr2.getNickName()); + formData.put("发放人", ffr1.getNickName()); + + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + } + if (StringUtils.isBlank(zcg.getGlyj())) { + zcg.setGlyj(glyj); + } else { + zcg.setGlyj(zcg.getGlyj() + "," + glyj); + } + zcg.setZt(zcgJyztEnum.jyz.getValue()); + zcgService.updateById(zcg); + this.saveOrUpdateBatch(gyzjList); + gyzjJcgjService.saveBatch(gyzjJcgjList); + + } + + + /** + * 发放 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void ff(@RequestBody FfForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能发放"); + } + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + if (lqr1 == null) { + throw new SecurityException("领取人1不存在"); + } + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + if (lqr2 == null) { + throw new SecurityException("领取人2不存在"); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + if (ffr1 == null) { + throw new SecurityException("发放人1不存在"); + } + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + if (ffr2 == null) { + throw new SecurityException("发放人2不存在"); + } + //验证领取人1、领取人2、发放人1、发放人2密码 todo + + Date now = new Date(); + + //region 发放记录 + + GyzjFfjl gyzjFfjl = new GyzjFfjl(); + gyzjFfjl.setGyzjId(gyzjOld.getId()); + gyzjFfjl.setMc(gyzjOld.getMc()); + gyzjFfjl.setBh(gyzjOld.getBh()); + gyzjFfjl.setNd(gyzjOld.getNd()); + gyzjFfjl.setNddw(gyzjOld.getNddw()); + gyzjFfjl.setCctj(gyzjOld.getCctj()); + gyzjFfjl.setCcwz(gyzjOld.getCcwz()); + gyzjFfjl.setSxrq(gyzjOld.getSxrq()); + gyzjFfjl.setCctj(gyzjOld.getCctj()); + gyzjFfjl.setCkl(gyzjOld.getKc()); + + gyzjFfjl.setCkldw(gyzjOld.getKcdw()); + gyzjFfjl.setCkmz(form.getCkmz()); + gyzjFfjl.setCkmzdw(form.getCkmzdw()); + gyzjFfjl.setLqr1Id(lqr1.getUserId()); + gyzjFfjl.setLqr2Id(lqr2.getUserId()); + gyzjFfjl.setFfr1Id(ffr1.getUserId()); + gyzjFfjl.setFfr2Id(ffr2.getUserId()); + gyzjFfjl.setLqr1Mc(lqr1.getNickName()); + gyzjFfjl.setLqr2Mc(lqr2.getNickName()); + gyzjFfjl.setFfr1Mc(ffr1.getNickName()); + gyzjFfjl.setFfr2Mc(ffr2.getNickName()); + gyzjFfjl.setFfzytj(form.getZytj()); + gyzjFfjl.setFfrq(now); + gyzjFfjl.setFfbz(form.getRemark()); + gyzjFfjl.setMdIds(form.getMdIds()); + + + gyzjFfjlService.save(gyzjFfjl); + + //endregion + + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gyzjOld.getKc()); + formData.put("转移条件", form.getZytj()); + formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw()); + formData.put("目的", form.getMdIds()); + formData.put("备注", form.getRemark()); + + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(),JcgjUtil.formatStr(formData), + SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + + //region 台账 + gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", + ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", + "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); + //endregion + + + //region 更新发放信息 + gyzjOld.setCkl(gyzjOld.getKc()); + gyzjOld.setCkldw(gyzjOld.getKcdw()); + gyzjOld.setFfzytj(form.getZytj()); + gyzjOld.setCkmz(form.getCkmz()); + gyzjOld.setCkmzdw(form.getCkmzdw()); + gyzjOld.setLqr1Id(lqr1.getUserId()); + gyzjOld.setLqr2Id(lqr2.getUserId()); + gyzjOld.setFfr1Id(ffr1.getUserId()); + gyzjOld.setFfr2Id(ffr2.getUserId()); + gyzjOld.setLqr1Mc(lqr1.getNickName()); + gyzjOld.setLqr2Mc(lqr2.getNickName()); + gyzjOld.setFfr1Mc(ffr1.getNickName()); + gyzjOld.setFfr2Mc(ffr2.getNickName()); + gyzjOld.setFfr2Mc(ffr2.getNickName()); + gyzjOld.setFfrq(now); + gyzjOld.setFfbz(form.getRemark()); + gyzjOld.setMdIds(form.getMdIds()); + gyzjOld.setZjzt(ZjztEnum.yff.getValue()); + //endregion + + this.updateById(gyzjOld); + + } + + + /** + * 批量发放 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plff(@RequestBody PlffForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + if (lqr1 == null) { + throw new SecurityException("领取人1不存在"); + } + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + if (lqr2 == null) { + throw new SecurityException("领取人2不存在"); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + if (ffr1 == null) { + throw new SecurityException("发放人1不存在"); + } + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + if (ffr2 == null) { + throw new SecurityException("发放人2不存在"); + } + //验证领取人1、领取人2、发放人1、发放人2密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + if (form.getList().size() < 0) { + throw new SecurityException("参数list不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + List gyzjList = this.list(queryWrapper); + List gyzjJcgjList = new ArrayList<>(); + List gyzjFfjlList = new ArrayList<>(); + List gyzjTzList = new ArrayList<>(); + if (gyzjList.size() <= 0) { + throw new SecurityException("麻精药不是入库状态，不能发放"); + } + Date now = new Date(); + for (Gyzj gyzj : gyzjList) { + //验证库存 + BigDecimal kc = new BigDecimal(gyzj.getKc()); + if (kc.compareTo(BigDecimal.ZERO) <= 0) { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】库存不足，不能发放"); + } + List plffItemFilter = form.getList().stream() + .filter(p -> p.getId().equals(gyzj.getId())) + .collect(Collectors.toList()); + if (plffItemFilter.size() > 0) { + + //region 发放记录 + GyzjFfjl gyzjFfjl = new GyzjFfjl(); + gyzjFfjl.setGyzjId(gyzj.getId()); + gyzjFfjl.setMc(gyzj.getMc()); + gyzjFfjl.setBh(gyzj.getBh()); + gyzjFfjl.setNd(gyzj.getNd()); + gyzjFfjl.setNddw(gyzj.getNddw()); + gyzjFfjl.setCctj(gyzj.getCctj()); + gyzjFfjl.setCcwz(gyzj.getCcwz()); + gyzjFfjl.setSxrq(gyzj.getSxrq()); + gyzjFfjl.setCctj(gyzj.getCctj()); + gyzjFfjl.setCkl(gyzj.getKc()); + + gyzjFfjl.setCkldw(gyzj.getKcdw()); + gyzjFfjl.setCkmz(plffItemFilter.get(0).getCkmz()); + gyzjFfjl.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); + gyzjFfjl.setLqr1Id(lqr1.getUserId()); + gyzjFfjl.setLqr2Id(lqr2.getUserId()); + gyzjFfjl.setFfr1Id(ffr1.getUserId()); + gyzjFfjl.setFfr2Id(ffr2.getUserId()); + gyzjFfjl.setLqr1Mc(lqr1.getNickName()); + gyzjFfjl.setLqr2Mc(lqr2.getNickName()); + gyzjFfjl.setFfr1Mc(ffr1.getNickName()); + gyzjFfjl.setFfr2Mc(ffr2.getNickName()); + gyzjFfjl.setFfzytj(plffItemFilter.get(0).getZytj()); + gyzjFfjl.setFfrq(now); + gyzjFfjl.setFfbz(plffItemFilter.get(0).getRemark()); + gyzjFfjl.setMdIds(plffItemFilter.get(0).getMdIds()); + + gyzjFfjlList.add(gyzjFfjl); + //endregion + + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzj.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("领取发放"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gyzj.getKc()); + formData.put("转移条件", plffItemFilter.get(0).getZytj()); + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw()); + formData.put("目的", plffItemFilter.get(0).getMdIds()); + formData.put("备注", plffItemFilter.get(0).getRemark()); + + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjList.add(gyzjJcgj); + //endregion + + //region 台账 + GyzjTz gyzjTz = new GyzjTz(); + gyzjTz.setGyzjId(gyzj.getId()); + gyzjTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName()); + gyzjTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName()); + gyzjTz.setQmyy("领取发放"); + gyzjTz.setCzl(gyzj.getKc()); + gyzjTz.setCzldw(gyzj.getKcdw()); + gyzjTz.setRemark(plffItemFilter.get(0).getRemark()); + gyzjTzList.add(gyzjTz); + //endregion + + //region 更新发放信息 + gyzj.setCkl(gyzj.getKc()); + gyzj.setCkldw(gyzj.getKcdw()); + gyzj.setFfzytj(plffItemFilter.get(0).getZytj()); + gyzj.setCkmz(plffItemFilter.get(0).getCkmz()); + gyzj.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); + gyzj.setLqr1Id(lqr1.getUserId()); + gyzj.setLqr2Id(lqr2.getUserId()); + gyzj.setFfr1Id(ffr1.getUserId()); + gyzj.setFfr2Id(ffr2.getUserId()); + gyzj.setLqr1Mc(lqr1.getNickName()); + gyzj.setLqr2Mc(lqr2.getNickName()); + gyzj.setFfr1Mc(ffr1.getNickName()); + gyzj.setFfr2Mc(ffr2.getNickName()); + gyzj.setFfr2Mc(ffr2.getNickName()); + gyzj.setFfrq(now); + gyzj.setFfbz(plffItemFilter.get(0).getRemark()); + gyzj.setMdIds(plffItemFilter.get(0).getMdIds()); + gyzj.setZjzt(ZjztEnum.yff.getValue()); + //endregion + + } else { + throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + } + } + gyzjJcgjService.saveBatch(gyzjJcgjList); + gyzjFfjlService.saveBatch(gyzjFfjlList); + gyzjTzService.saveBatch(gyzjTzList); + this.saveOrUpdateBatch(gyzjList); + } + + /** + * 编辑 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void bj(@RequestBody BjForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getBjzt().equals(BjEnum.wbj.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经提交编辑申请，请等待审核"); + } + if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能编辑"); + } + List gyzjJcgjList = new ArrayList<>(); + + List fieldChanges = ObjectCompareUtil.compareObjects(gyzjOld, form); + if (fieldChanges.size() == 0) { + throw new SecurityException("你没有修改任何内容"); + } + for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjOld.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("申请编辑"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gyzjJcgj.setJcnr(fieldChange.toString()); + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgjList.add(gyzjJcgj); + } + gyzjOld.setMcbj(form.getMc()); + gyzjOld.setNdbj(form.getNd()); + gyzjOld.setNddwbj(form.getNddw()); + gyzjOld.setSxrqbj(form.getSxrq()); + gyzjOld.setCctjbj(form.getCctj()); + gyzjOld.setCcwzbj(form.getCcwz()); + + gyzjOld.setBjbz(form.getBjbz()); + gyzjOld.setBjrId(qmr.getUserId()); + gyzjOld.setBjrMc(qmr.getNickName()); + gyzjOld.setBjzt(BjEnum.shz.getValue()); + this.updateById(gyzjOld); + gyzjJcgjService.saveBatch(gyzjJcgjList); + } + + /** + * 审核编辑 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void shbj(@RequestBody ShbjForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getBjzt().equals(BjEnum.shz.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】没有提交编辑申请，不能审核编辑"); + } + if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); + } + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjOld.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc(form.getQmyy()); + if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + } else { + gyzjJcgj.setJcmcys(JcmcysEnum.red.getValue()); + } + gyzjJcgj.setJcnr("申请备注：" + gyzjOld.getBjbz() + "；审核备注：" + form.getRemark()); + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgjService.save(gyzjJcgj); + //endregion + + //region 更新 + if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { + gyzjOld.setCcwz(gyzjOld.getCcwzbj()); + gyzjOld.setCctj(gyzjOld.getCctjbj()); + gyzjOld.setSxrq(gyzjOld.getSxrqbj()); + gyzjOld.setNddw(gyzjOld.getNddwbj()); + gyzjOld.setNd(gyzjOld.getNdbj()); + gyzjOld.setMc(gyzjOld.getMcbj()); + } + + //清空编辑信息 + gyzjOld.setMcbj(null); + gyzjOld.setNddwbj(null); + gyzjOld.setNdbj(null); + gyzjOld.setSxrqbj(null); + gyzjOld.setCctjbj(null); + gyzjOld.setCcwzbj(null); + gyzjOld.setBjbz(null); + gyzjOld.setBjrId(null); + gyzjOld.setBjrMc(null); + gyzjOld.setBjzt(BjEnum.wbj.getValue()); + this.updateById(gyzjOld); + //endregion + } + + + /** + * 修改库存 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void xgkc(@RequestBody XgkcForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getKcbjzt().equals(KcbjEnum.wbj.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经提交修改库存申请，请等待审核"); + } + if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能修改库存"); + } + List fieldChanges = ObjectCompareUtil.compareObjects(gyzjOld, form); + if (fieldChanges.size() == 0) { + throw new SecurityException("你没有修改任何内容"); + } + List gyzjJcgjList = new ArrayList<>(); + //region 稽查轨迹 + for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjOld.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc("修改库存申请"); + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gyzjJcgj.setJcnr(fieldChange.toString()); + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgjList.add(gyzjJcgj); + } + //endregion + + gyzjOld.setKcdwbj(form.getKcdw()); + gyzjOld.setKcbj(form.getKc()); + gyzjOld.setKcbjrId(qmr.getUserId()); + gyzjOld.setKcbjrMc(qmr.getNickName()); + gyzjOld.setKcbjzt(KcbjEnum.shz.getValue()); + gyzjOld.setKcbjbz(form.getKcbjbz()); + this.updateById(gyzjOld); + gyzjJcgjService.saveBatch(gyzjJcgjList); + + } + + + /** + * 审核修改库存 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void shxgkc(@RequestBody ShxgkcForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!gyzjOld.getKcbjzt().equals(KcbjEnum.shz.getValue())) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】没有提交修改库存申请，不能审核修改库存"); + } + if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); + } + //region 稽查轨迹 + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjOld.getId()); + gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gyzjJcgj.setJcmc(form.getQmyy()); + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + } else { + gyzjJcgj.setJcmcys(JcmcysEnum.red.getValue()); + } + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", gyzjOld.getKcbjbz()); + formData.put("审核备注", form.getRemark()); + gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgjService.save(gyzjJcgj); + //endregion + + //region 更新 + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gyzjOld.setKcdw(gyzjOld.getKcdwbj()); + gyzjOld.setKc(gyzjOld.getKcbj()); + } + gyzjOld.setKcbj(null); + gyzjOld.setKcdwbj(null); + gyzjOld.setKcbjbz(null); + gyzjOld.setKcbjzt(KcbjEnum.wbj.getValue()); + this.updateById(gyzjOld); + //endregion + + //region 台账 + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gyzjTzService.saveTz(gyzjOld.getId(), "", "", + "", "", qmr.getUserId(), qmr.getNickName(), + "修改库存", form.getKc(), form.getKcdw(), gyzjOld.getKcbjbz()); + } + //endregion + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java index f52c2e6..abacf74 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java @@ -3,6 +3,7 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.GyzjJcgj; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjTzMapper; import com.hxhq.business.domain.GyzjTz; @@ -10,7 +11,7 @@ import com.hxhq.business.service.IGyzjTzService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * 给药制剂-台账Service业务层处理 + * 麻精药-台账Service业务层处理 * * @author hxhq * @date 2025-12-18 @@ -18,17 +19,51 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class GyzjTzServiceImpl extends ServiceImpl implements IGyzjTzService { + /** - * 查询给药制剂-台账列表 - * - * @param gyzjTz 给药制剂-台账 - * @return 给药制剂-台账 + * 查询台账列表 + * @param gyzjTz 麻精药 + * @return */ @Override - public List queryList(GyzjTz gyzjTz) - { + public List queryList(GyzjTz gyzjTz){ QueryWrapper queryWrapper = Wrappers.query(); + if(gyzjTz.getGyzjId()==null||gyzjTz.getGyzjId().longValue()<0){ + throw new SecurityException("麻精药id不能为空"); + } + queryWrapper.eq("gyzj_id",gyzjTz.getGyzjId()); + queryWrapper.orderByDesc("id"); return this.list(queryWrapper); } + /** + * 新增台账 + * @param gyzjId 麻精药id + * @param lqrMc 领取人名称 + * @param ghrMc 归还人名称 + * @param ffrMc 发放人名称 + * @param jsrMc 接收人名称 + * @param qmrId 签名人id + * @param qmrMc 签名人名称 + * @param qmyy 签名意义 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 + */ + @Override + public void saveTz(Long gyzjId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark){ + GyzjTz gyzjTz = new GyzjTz(); + gyzjTz.setGyzjId(gyzjId); + gyzjTz.setLqrMc(lqrMc); + gyzjTz.setGhrMc(ghrMc); + gyzjTz.setFfrMc(ffrMc); + gyzjTz.setJsrMc(jsrMc); + gyzjTz.setQmrId(qmrId); + gyzjTz.setQmrMc(qmrMc); + gyzjTz.setQmyy(qmyy); + gyzjTz.setCzldw(czldw); + gyzjTz.setCzl(czl); + gyzjTz.setRemark(remark); + this.save(gyzjTz); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 9b8cb23..8a8f426 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -7,11 +7,9 @@ import java.util.Map; 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.MjyFfjlJcgj; -import com.hxhq.business.dto.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlDetailDto; -import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.dto.mjy.FfjlDetailDto; +import com.hxhq.business.dto.mjy.FfjlListDto; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.enums.zykgl.JlztEnum; import com.hxhq.business.form.mjy.*; @@ -52,7 +50,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl * @return 发放记录发放记录 */ @Override - public List queryList(FfjlSearchForm form) + public List queryList(FfjlSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); @@ -160,7 +158,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl * @return 暂存柜 */ @Override - public MjyFfjlDetailDto queryInfo(Long id) { + public FfjlDetailDto queryInfo(Long id) { if (id == null || id.longValue() < 0) { throw new SecurityException("参数id不正确"); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index ec76670..acdd752 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -7,8 +7,8 @@ import java.util.stream.Collectors; 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.mjy.MjyDetailDto; -import com.hxhq.business.dto.mjy.MjyListDto; +import com.hxhq.business.dto.mjy.DetailDto; +import com.hxhq.business.dto.mjy.ListDto; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.*; @@ -56,7 +56,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @return 暂存柜 */ @Override - public List queryList(SearchForm form) { + public List queryList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { @@ -89,7 +89,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @return 暂存柜 */ @Override - public MjyDetailDto queryInfo(Long id) { + public DetailDto queryInfo(Long id) { if (id == null || id.longValue() < 0) { throw new SecurityException("参数id不正确"); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index 4fb7a91..c8afa61 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -3,4 +3,22 @@ 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/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml index 81b7e50..d5a01da 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml @@ -3,4 +3,24 @@ 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/GyzjfjlJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjfjlJcgjMapper.xml new file mode 100644 index 0000000..fb29ea9 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjfjlJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml index 5a8dec1..b5f701d 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc ,z.mc as zcgMc @@ -16,7 +16,7 @@ - select t.* FROM `t_mjy_ffjl` t where t.id=#{id} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml index 633ca26..e018789 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml @@ -4,13 +4,13 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select t.* FROM `t_mjy` t where t.id=#{id} - select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as mdMc ,z.mc as zcgMc