diff --git a/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/domain/MpBaseEntity.java b/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/domain/MpBaseEntity.java index 4cf8cd1..edad5c2 100644 --- a/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/domain/MpBaseEntity.java +++ b/hxhq-common/hxhq-common-core/src/main/java/com/hxhq/common/core/domain/MpBaseEntity.java @@ -2,6 +2,7 @@ package com.hxhq.common.core.domain; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.common.core.annotation.Compare; import com.hxhq.common.core.annotation.Excel; import java.io.Serializable; @@ -40,7 +41,7 @@ public class MpBaseEntity implements Serializable private Date updateTime; /** 备注 */ - @Excel(name = "备注") + @Compare(name = "备注") private String remark; @TableField(value = "del_flag", fill = FieldFill.INSERT) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java new file mode 100644 index 0000000..2cda9d1 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java @@ -0,0 +1,268 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import com.hxhq.business.domain.*; +import com.hxhq.business.form.gsp.*; +import com.hxhq.business.form.mjy.*; +import com.hxhq.business.form.sj.*; +import com.hxhq.business.service.IGspJcgjService; +import com.hxhq.business.service.IGspTzService; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.service.IGspService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 供试品管理Controller + * + * @author HanLong + * @date 2025-12-30 + */ +@RestController +@RequestMapping("/business/gsp") +public class GspController extends BaseController { + @Autowired + private IGspService gspService; + + @Autowired + private IGspJcgjService gspJcgjService; + + @Autowired + private IGspTzService gspTzService; + + /** + * 查询供试品管理列表 + */ + @GetMapping("/list") + public TableDataInfo list(GspListForm form) { + startPage(); + List list = gspService.queryList(form); + return getDataTable(list); + } + + /** + * 稽查轨迹列表 + */ + @GetMapping("/jcgjList") + public TableDataInfo jcgjList(GspJcgj form) + { + startPage(); + List list = gspJcgjService.queryList(form); + return getDataTable(list); + } + + /** + * 台账列表 + */ + @GetMapping("/tzList") + public TableDataInfo tzList(GspTz form) + { + startPage(); + List list = gspTzService.queryList(form); + return getDataTable(list); + } + + /** + * 获取供试品管理详细信息 + */ + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) { + return AjaxResult.success(gspService.getById(id)); + } + + /** + * 新增供试品管理信息 + */ + @PostMapping("/save") + public AjaxResult save(@RequestBody @Validated GspForm form) { + form.setQmrId(SecurityUtils.getUserId()); + gspService.save(form); + return AjaxResult.success("操作成功"); + } + + /** + * 编辑供试品管理信息 + */ + @PostMapping("/edit") + public AjaxResult edit(@RequestBody @Validated GspBjForm form) { + form.setQmrId(SecurityUtils.getUserId()); + gspService.edit(form); + return AjaxResult.success("操作成功"); + } + + /** + * 审核编辑 + */ + @PostMapping("shbj") + public AjaxResult shbj(@RequestBody GspShbjForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.shbj(form); + return AjaxResult.success("操作成功"); + } + /** + * 钥匙发放 + */ + @PostMapping("/ysff") + public AjaxResult ysff(@RequestBody GspYsffForm form) + { + form.setFfrId(SecurityUtils.getUserId()); + gspService.ysff(form); + return AjaxResult.success("操作成功"); + } + + /** + * 发放 + */ + @PostMapping("/ff") + public AjaxResult ff(@RequestBody @Validated FfGspForm form) { + gspService.ff(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量发放 + */ + @PostMapping("/plff") + public AjaxResult plff(@RequestBody GspPlffForm form) + { + gspService.plff(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归还 + */ + @PostMapping("gh") + public AjaxResult gh(@RequestBody GspGhForm form) + { + gspService.gh(form); + return AjaxResult.success("操作成功"); + } + + /** + * 修改库存 + */ + @PostMapping("xgkc") + public AjaxResult xgkc(@RequestBody GspXgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.xgkc(form); + return AjaxResult.success("操作成功"); + } + + /** + * 审核修改库存 + */ + @PostMapping("shxgkc") + public AjaxResult shxgkc(@RequestBody GspShxgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.shxgkc(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + public AjaxResult plsd(@RequestBody GspSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + public AjaxResult sd(@RequestBody GspSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.sd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 解锁 + */ + @PostMapping("/js") + public AjaxResult js(@RequestBody GspJsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.js(form); + return AjaxResult.success("操作成功"); + } + + /** 处置 */ + @PostMapping("/cz") + public AjaxResult cz(@RequestBody @Validated GspCzForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.cz(form); + return AjaxResult.success("操作成功"); + } + + /** 批量处置 */ + @PostMapping("/plcz") + public AjaxResult plcz(@RequestBody @Validated GspPlczForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.plcz(form); + return AjaxResult.success("操作成功"); + } + + /** + * 借阅 + */ + @PostMapping("/jy") + public AjaxResult jy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.jy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 解档 + */ + @PostMapping("/jd") + public AjaxResult jd(@RequestBody @Validated GspJdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + public AjaxResult plgd(@RequestBody GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + public AjaxResult gd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.gd(form); + return AjaxResult.success("操作成功"); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java new file mode 100644 index 0000000..7e68cfa --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java @@ -0,0 +1,159 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import com.hxhq.business.domain.GspFfjlJcgj; +import com.hxhq.business.domain.MjyFfjlJcgj; +import com.hxhq.business.form.mjy.*; +import com.hxhq.business.service.IGspFfjlJcgjService; +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 com.hxhq.business.domain.GspFfjl; +import com.hxhq.business.service.IGspFfjlService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 供试品发放记录Controller + * + * @author hxhq + * @date 2025-12-30 + */ +@RestController +@RequestMapping("/business/gspFfjl") +public class GspFfjlController extends BaseController +{ + @Autowired + private IGspFfjlService gspFfjlService; + + @Autowired + private IGspFfjlJcgjService gspFfjlJcgjService; + + /** + * 查询供试品发放记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(GspFfjl gspFfjl) + { + startPage(); + List list = gspFfjlService.queryList(gspFfjl); + return getDataTable(list); + } + + /** + * 详细信息 + */ + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) + { + return AjaxResult.success(gspFfjlService.getById(id)); + } + + /** + * 稽查轨迹列表 + */ + @GetMapping("/jcgjList") + public TableDataInfo jcgjList(GspFfjlJcgj form) + { + startPage(); + List list = gspFfjlJcgjService.queryList(form); + return getDataTable(list); + } + + /** + * 解档 + */ + @PostMapping("/jd") + public AjaxResult jd(@RequestBody FfjlJdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + public AjaxResult plgd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + public AjaxResult gd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.gd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + public AjaxResult plsd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + @RequiresPermissions("business:resource:mjy:ffjlsd") + public AjaxResult sd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.sd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 解锁 + */ + @PostMapping("/js") + @RequiresPermissions("business:resource:mjy:ffjljs") + public AjaxResult js(@RequestBody FfjlJsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.js(form); + return AjaxResult.success("操作成功"); + } + + /** + * 借阅 + */ + @PostMapping("/jy") + @RequiresPermissions("business:resource:mjy:ffjljy") + public AjaxResult jy(@RequestBody FfjlJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.jy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 加签 + */ + @PostMapping("/jq") + @RequiresPermissions("business:resource:mjy:ffjljq") + public AjaxResult jq(@RequestBody FfjlJqForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.jq(form); + return AjaxResult.success("操作成功"); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java new file mode 100644 index 0000000..0aec83a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java @@ -0,0 +1,65 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.domain.GspRkjl; +import com.hxhq.business.service.IGspRkjlService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 供试品入库记录Controller + * + * @author hxhq + * @date 2025-12-30 + */ +@RestController +@RequestMapping("/business/rkjl") +public class GspRkjlController extends BaseController +{ + @Autowired + private IGspRkjlService gspRkjlService; + + /** + * 查询供试品入库记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(GspRkjl gspRkjl) + { + startPage(); + List list = gspRkjlService.queryList(gspRkjl); + return getDataTable(list); + } + + /** + * 获取供试品入库记录详细信息 + */ + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) + { + return AjaxResult.success(gspRkjlService.getById(id)); + } + + /** + * 新增供试品入库记录信息 + */ + @PostMapping("/save") + public AjaxResult save(@RequestBody GspRkjl gspRkjl) + { + return toAjax(gspRkjlService.saveOrUpdate(gspRkjl)); + } + + /** + * 删除供试品入库记录信息 + */ + @PostMapping("/delete") + public AjaxResult delete(@RequestBody Long[] ids) + { + return toAjax(gspRkjlService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java index 0d3fad9..bc63b81 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java @@ -28,10 +28,10 @@ import com.hxhq.common.core.web.page.TableDataInfo; public class SjController extends BaseController { @Autowired - private ISjService sjkcService; + private ISjService sjService; @Autowired - private ISjJcgjService sjkcJcgjService; + private ISjJcgjService sjJcgjService; @Autowired private ISjTzService sjTzService; @@ -43,7 +43,7 @@ public class SjController extends BaseController public TableDataInfo jcgjList(SjJcgj form) { startPage(); - List list = sjkcJcgjService.queryList(form); + List list = sjJcgjService.queryList(form); return getDataTable(list); } @@ -65,7 +65,7 @@ public class SjController extends BaseController public TableDataInfo list(Sj sj) { startPage(); - List list = sjkcService.queryList(sj); + List list = sjService.queryList(sj); return getDataTable(list); } @@ -75,16 +75,18 @@ public class SjController extends BaseController @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { - return AjaxResult.success(sjkcService.getById(id)); + return AjaxResult.success(sjService.getById(id)); } /** * 新增试剂库存信息 */ @PostMapping("/save") - public AjaxResult save(@RequestBody Sj sj) + public AjaxResult save(@RequestBody SjBjForm form) { - return toAjax(sjkcService.saveOrUpdate(sj)); + form.setQmrId(SecurityUtils.getUserId()); + sjService.bj(form); + return AjaxResult.success("操作成功"); } /** @@ -94,7 +96,7 @@ public class SjController extends BaseController public AjaxResult xgkc(@RequestBody @Validated SjXgkcForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.xgkc(form); + sjService.xgkc(form); return AjaxResult.success("操作成功"); } @@ -103,7 +105,7 @@ public class SjController extends BaseController public AjaxResult cz(@RequestBody @Validated CzSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.cz(form); + sjService.cz(form); return AjaxResult.success("操作成功"); } @@ -112,7 +114,7 @@ public class SjController extends BaseController public AjaxResult plcz(@RequestBody @Validated PlczSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.plcz(form); + sjService.plcz(form); return AjaxResult.success("操作成功"); } @@ -121,7 +123,7 @@ public class SjController extends BaseController public AjaxResult sd(@RequestBody @Validated SdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.sd(form); + sjService.sd(form); return AjaxResult.success("操作成功"); } @@ -133,7 +135,7 @@ public class SjController extends BaseController return error("请选择锁定对象"); } form.setQmrId(SecurityUtils.getUserId()); - sjkcService.plsd(form); + sjService.plsd(form); return AjaxResult.success("操作成功"); } @@ -142,7 +144,7 @@ public class SjController extends BaseController public AjaxResult js(@RequestBody @Validated JsSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.js(form); + sjService.js(form); return AjaxResult.success("操作成功"); } @@ -153,7 +155,7 @@ public class SjController extends BaseController public AjaxResult jy(@RequestBody @Validated JySjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.jy(form); + sjService.jy(form); return AjaxResult.success("操作成功"); } @@ -164,7 +166,7 @@ public class SjController extends BaseController public AjaxResult jd(@RequestBody @Validated JdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.jd(form); + sjService.jd(form); return AjaxResult.success("操作成功"); } @@ -172,10 +174,10 @@ public class SjController extends BaseController * 批量归档 */ @PostMapping("/plgd") - public AjaxResult plgd(@RequestBody GdForm form) + public AjaxResult plgd(@RequestBody GdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.plgd(form); + sjService.plgd(form); return AjaxResult.success("操作成功"); } @@ -186,7 +188,7 @@ public class SjController extends BaseController public AjaxResult gd(@RequestBody @Validated GdSjForm form) { form.setQmrId(SecurityUtils.getUserId()); - sjkcService.gd(form); + sjService.gd(form); return AjaxResult.success("操作成功"); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java new file mode 100644 index 0000000..2d5db2a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java @@ -0,0 +1,587 @@ +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.Compare; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品管理对象 t_gsp + * + * @author HanLong + * @date 2025-12-30 + */ +@TableName("t_gsp") +public class Gsp extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */ + private Integer zjzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 编辑状态：1:未编辑 3:审核中 */ + private Integer bjzt; + + /** 库存编辑状态：1:未编辑 3:审核中 */ + private Integer kcbjzt; + + /** 名称 */ + @Compare(name = "名称") + private String mc; + + /** 编号 */ + private String bh; + + /** 批号 */ + @Compare(name = "批号") + private String ph; + + /** 规格 */ + @Compare(name = "规格") + private String gg; + + /** 规格 */ + @Compare(name = "规格单位") + private String ggdw; + + /** 库存数量 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 有效期 */ + @Compare(name = "有效期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date yxq; + + /** 接收日期 */ + @Compare(name = "接收日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date jsrq; + + /** 存储条件 */ + @Compare(name = "存储条件") + private String cctj; + + /** 注意事项 */ + @Compare(name = "注意事项") + private String zysx; + + /** 名称编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String mcbj; + + /** 批号编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String phbj; + + /** 规格编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String ggbj; + + /** 规格单位 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String ggdwbj; + + /** 有效期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Date yxqbj; + + /** 接收日期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Date jsrqbj; + + /** 存储条件编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String cctjbj; + + /** 注意事项编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String zysxbj; + + /** 库存编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbj; + + /** 库存单位编辑 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcdwbj; + + /** 编辑备注 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjbz; + + /** 库存备注 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjbz; + + /** 编辑人id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long bjrId; + + /** 编辑人名称 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjrMc; + + /** 库存编辑人id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kcbjrId; + + /** 库存编辑人名称 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjrMc; + + /** 发放转移条件 */ + private String ffzytj; + + /** 领取人1id */ + private Long lqr1Id; + + /** 领取人2id */ + private Long lqr2Id; + + /** 发放人1id */ + private Long ffr1Id; + + /** 发放人2id */ + private Long ffr2Id; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 发放日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ffrq; + + /** 发放备注 */ + private String ffbz; + + /** 发放目的ids */ + private String mdIds; + + /** 关联暂存柜id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long zcgId; + + /** 借阅开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + public 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 Long getZcgId() { + return zcgId; + } + + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; + } + + public void setZjzt(Integer zjzt) + { + this.zjzt = zjzt; + } + + public Integer getZjzt() + { + return zjzt; + } + + public void setJyzt(Integer jyzt) + { + this.jyzt = jyzt; + } + + public Integer getJyzt() + { + return jyzt; + } + + public void setMc(String mc) + { + this.mc = mc; + } + + public String getMc() + { + return mc; + } + + public void setBh(String bh) + { + this.bh = bh; + } + + public String getBh() + { + return bh; + } + + public void setPh(String ph) + { + this.ph = ph; + } + + public String getPh() + { + return ph; + } + + public void setGg(String gg) + { + this.gg = gg; + } + + public String getGg() + { + return gg; + } + + public void setGgdw(String ggdw) + { + this.ggdw = ggdw; + } + + public String getGgdw() + { + return ggdw; + } + + public void setKc(String kc) + { + this.kc = kc; + } + + public String getKc() + { + return kc; + } + + public void setKcdw(String kcdw) + { + this.kcdw = kcdw; + } + + public String getKcdw() + { + return kcdw; + } + + public void setYxq(Date yxq) + { + this.yxq = yxq; + } + + public Date getYxq() + { + return yxq; + } + + public void setJsrq(Date jsrq) + { + this.jsrq = jsrq; + } + + public Date getJsrq() + { + return jsrq; + } + + public void setCctj(String cctj) + { + this.cctj = cctj; + } + + public String getCctj() + { + return cctj; + } + + public void setZysx(String zysx) + { + this.zysx = zysx; + } + + public String getZysx() + { + return zysx; + } + + public Integer getBjzt() { + return bjzt; + } + + public void setBjzt(Integer bjzt) { + this.bjzt = bjzt; + } + + public Integer getKcbjzt() { + return kcbjzt; + } + + public void setKcbjzt(Integer kcbjzt) { + this.kcbjzt = kcbjzt; + } + + public String getMcbj() { + return mcbj; + } + + public void setMcbj(String mcbj) { + this.mcbj = mcbj; + } + + public String getPhbj() { + return phbj; + } + + public void setPhbj(String phbj) { + this.phbj = phbj; + } + + public String getGgbj() { + return ggbj; + } + + public void setGgbj(String ggbj) { + this.ggbj = ggbj; + } + + public String getGgdwbj() { + return ggdwbj; + } + + public void setGgdwbj(String ggdwbj) { + this.ggdwbj = ggdwbj; + } + + public Date getYxqbj() { + return yxqbj; + } + + public void setYxqbj(Date yxqbj) { + this.yxqbj = yxqbj; + } + + public Date getJsrqbj() { + return jsrqbj; + } + + public void setJsrqbj(Date jsrqbj) { + this.jsrqbj = jsrqbj; + } + + public String getCctjbj() { + return cctjbj; + } + + public void setCctjbj(String cctjbj) { + this.cctjbj = cctjbj; + } + + public String getZysxbj() { + return zysxbj; + } + + public void setZysxbj(String zysxbj) { + this.zysxbj = zysxbj; + } + + public String getKcbj() { + return kcbj; + } + + public void setKcbj(String kcbj) { + this.kcbj = kcbj; + } + + public String getKcdwbj() { + return kcdwbj; + } + + public void setKcdwbj(String kcdwbj) { + this.kcdwbj = kcdwbj; + } + + public String getBjbz() { + return bjbz; + } + + public void setBjbz(String bjbz) { + this.bjbz = bjbz; + } + + public String getKcbjbz() { + return kcbjbz; + } + + public void setKcbjbz(String kcbjbz) { + this.kcbjbz = kcbjbz; + } + + public Long getBjrId() { + return bjrId; + } + + public void setBjrId(Long bjrId) { + this.bjrId = bjrId; + } + + public String getBjrMc() { + return bjrMc; + } + + public void setBjrMc(String bjrMc) { + this.bjrMc = bjrMc; + } + + public Long getKcbjrId() { + return kcbjrId; + } + + public void setKcbjrId(Long kcbjrId) { + this.kcbjrId = kcbjrId; + } + + public String getKcbjrMc() { + return kcbjrMc; + } + + public void setKcbjrMc(String kcbjrMc) { + this.kcbjrMc = kcbjrMc; + } + + public String getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getLqr1Mc() { + return lqr1Mc; + } + + public void setLqr1Mc(String lqr1Mc) { + this.lqr1Mc = lqr1Mc; + } + + public String getLqr2Mc() { + return lqr2Mc; + } + + public void setLqr2Mc(String lqr2Mc) { + this.lqr2Mc = lqr2Mc; + } + + public String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public String getFfbz() { + return ffbz; + } + + public void setFfbz(String ffbz) { + this.ffbz = ffbz; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java new file mode 100644 index 0000000..b080c01 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java @@ -0,0 +1,553 @@ +package com.hxhq.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品发放记录对象 t_gsp_ffjl + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_ffjl") +public class GspFfjl extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 供试品id */ + private Long gspId; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 批号 */ + private String ph; + + /** 规格 */ + private String gg; + + /** 规格单位 */ + private String ggdw; + + /** 有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date yxq; + + /** 保存条件 */ + private String cctj; + + /** 接收日期 */ + private Date jsrq; + + /** 发放转移条件 */ + private String ffzytj; + + /** 出库数量 */ + private String ckl; + + /** 出库单位 */ + private String ckldw; + + /** 领取人1id */ + private Long lqr1Id; + + private String lqr1Mc; + + /** 领取人2id */ + private Long lqr2Id; + + private String lqr2Mc; + + /** 发放人1id */ + private Long ffr1Id; + + private String ffr1Mc; + + /** 发放人2id */ + private Long ffr2Id; + + private String ffr2Mc; + + /** 发放日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ffrq; + + /** 目的 */ + private String mdIds; + + /** 归还人1id */ + private Long ghr1Id; + + private String ghr1Mc; + + /** 归还人2id */ + private Long ghr2Id; + + private String ghr2Mc; + + /** 归还转移条件 */ + private String ghzytj; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人1名称 */ + private String jsr1Mc; + + /** 接收人2id */ + private Long jsr2Id; + + /** 接收人2名称 */ + private String jsr2Mc; + + /** 入库数量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 归还日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ghrq; + + + /** 发放备注 */ + private String ffbz; + + /** 归还备注 */ + private String ghbz; + + /** 归档申请人id */ + private Long gdsqrId; + + /** 归档申请人名称 */ + private String gdsqrMc; + + /** 借阅开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + public void setJlzt(Integer jlzt) + { + this.jlzt = jlzt; + } + + public Integer getJlzt() + { + return jlzt; + } + + public void setJyzt(Integer jyzt) + { + this.jyzt = jyzt; + } + + public Integer getJyzt() + { + return jyzt; + } + + public void setGspId(Long gspId) + { + this.gspId = gspId; + } + + public Long getGspId() + { + return gspId; + } + + public void setMc(String mc) + { + this.mc = mc; + } + + public String getMc() + { + return mc; + } + + public void setBh(String bh) + { + this.bh = bh; + } + + public String getBh() + { + return bh; + } + + public void setPh(String ph) + { + this.ph = ph; + } + + public String getPh() + { + return ph; + } + + public void setGg(String gg) + { + this.gg = gg; + } + + public String getGg() + { + return gg; + } + + public void setGgdw(String ggdw) + { + this.ggdw = ggdw; + } + + public String getGgdw() + { + return ggdw; + } + + public void setYxq(Date yxq) + { + this.yxq = yxq; + } + + public Date getYxq() + { + return yxq; + } + + public void setCctj(String cctj) + { + this.cctj = cctj; + } + + public String getCctj() + { + return cctj; + } + + public void setJsrq(Date jsrq) + { + this.jsrq = jsrq; + } + + public Date getJsrq() + { + return jsrq; + } + + public void setFfzytj(String ffzytj) + { + this.ffzytj = ffzytj; + } + + public String getFfzytj() + { + return ffzytj; + } + + public void setCkl(String ckl) + { + this.ckl = ckl; + } + + public String getCkl() + { + return ckl; + } + + public void setCkldw(String ckldw) + { + this.ckldw = ckldw; + } + + public String getCkldw() + { + return ckldw; + } + + public void setLqr1Id(Long lqr1Id) + { + this.lqr1Id = lqr1Id; + } + + public Long getLqr1Id() + { + return lqr1Id; + } + + public void setLqr2Id(Long lqr2Id) + { + this.lqr2Id = lqr2Id; + } + + public Long getLqr2Id() + { + return lqr2Id; + } + + public void setGhr1Id(Long ghr1Id) + { + this.ghr1Id = ghr1Id; + } + + public Long getGhr1Id() + { + return ghr1Id; + } + + public void setGhr2Id(Long ghr2Id) + { + this.ghr2Id = ghr2Id; + } + + public Long getGhr2Id() + { + return ghr2Id; + } + + public void setGhzytj(String ghzytj) + { + this.ghzytj = ghzytj; + } + + public String getGhzytj() + { + return ghzytj; + } + + public void setRkl(String rkl) + { + this.rkl = rkl; + } + + public String getRkl() + { + return rkl; + } + + public void setRkldw(String rkldw) + { + this.rkldw = rkldw; + } + + public String getRkldw() + { + return rkldw; + } + + public void setGhrq(Date ghrq) + { + this.ghrq = ghrq; + } + + public Date getGhrq() + { + return ghrq; + } + + public void setFfbz(String ffbz) + { + this.ffbz = ffbz; + } + + public String getFfbz() + { + return ffbz; + } + + public void setGhbz(String ghbz) + { + this.ghbz = ghbz; + } + + public String getGhbz() + { + return ghbz; + } + + public void setGdsqrId(Long gdsqrId) + { + this.gdsqrId = gdsqrId; + } + + public Long getGdsqrId() + { + return gdsqrId; + } + + 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 Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getGhr1Mc() { + return ghr1Mc; + } + + public void setGhr1Mc(String ghr1Mc) { + this.ghr1Mc = ghr1Mc; + } + + public String getGhr2Mc() { + return ghr2Mc; + } + + public void setGhr2Mc(String ghr2Mc) { + this.ghr2Mc = ghr2Mc; + } + + public Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public String getJsr1Mc() { + return jsr1Mc; + } + + public void setJsr1Mc(String jsr1Mc) { + this.jsr1Mc = jsr1Mc; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public String getJsr2Mc() { + return jsr2Mc; + } + + public void setJsr2Mc(String jsr2Mc) { + this.jsr2Mc = jsr2Mc; + } + + 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 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 getGdsqrMc() { + return gdsqrMc; + } + + public void setGdsqrMc(String gdsqrMc) { + this.gdsqrMc = gdsqrMc; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java new file mode 100644 index 0000000..3db12d4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java @@ -0,0 +1,119 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品发放记录-稽查轨迹对象 t_gsp_ffjl_jcgj + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_ffjl_jcgj") +public class GspFfjlJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 供试品发放记录id */ + private Long ffjlId; + + /** 稽查轨迹类型 */ + private Integer jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Integer jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名意义 */ + private String qmyy; + + /** 签名人id */ + private Long qmrId; + + private String qmrMc; + + public String getQmrMc() { + return qmrMc; + } + + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; + } + + public void setFfjlId(Long ffjlId) + { + this.ffjlId = ffjlId; + } + + public Long getFfjlId() + { + return ffjlId; + } + + public void setJcgjlx(Integer jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public Integer getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Integer jcmcys) + { + this.jcmcys = jcmcys; + } + + public Integer getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + public void setQmyy(String qmyy) + { + this.qmyy = qmyy; + } + + public String getQmyy() + { + return qmyy; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java new file mode 100644 index 0000000..df39e1e --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java @@ -0,0 +1,106 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品管理-稽查轨迹对象 t_gsp_jcgj + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_jcgj") +public class GspJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 供试品id */ + private Long gspId; + + /** 稽查轨迹类型 */ + private Integer jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Integer jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人名称 */ + private String qmrMc; + + public void setGspId(Long gspId) + { + this.gspId = gspId; + } + + public Long getGspId() + { + return gspId; + } + + public void setJcgjlx(Integer jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public Integer getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Integer jcmcys) + { + this.jcmcys = jcmcys; + } + + public Integer getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + + public 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/GspRkjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java new file mode 100644 index 0000000..0d1296a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java @@ -0,0 +1,178 @@ +package com.hxhq.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品入库记录对象 t_gsp_rkjl + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_rkjl") +public class GspRkjl extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 名称 */ + private String mc; + + /** 批号 */ + private String ph; + + /** 规格 */ + private String gg; + + /** 规格 */ + private String ggdw; + + /** 入库数量 */ + private String rksl; + + /** 入库单位 */ + private String rkdw; + + /** 入库时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date rksj; + + /** 存储条件 */ + private Long bctj; + + /** 注意事项 */ + private String zysx; + + /** 归档申请人id */ + private Long gdsqrId; + + + public void setJlzt(Integer jlzt) + { + this.jlzt = jlzt; + } + + public Integer getJlzt() + { + return jlzt; + } + + public void setJyzt(Integer jyzt) + { + this.jyzt = jyzt; + } + + public Integer getJyzt() + { + return jyzt; + } + + public void setMc(String mc) + { + this.mc = mc; + } + + public String getMc() + { + return mc; + } + + public void setPh(String ph) + { + this.ph = ph; + } + + public String getPh() + { + return ph; + } + + public void setGg(String gg) + { + this.gg = gg; + } + + public String getGg() + { + return gg; + } + + public void setGgdw(String ggdw) + { + this.ggdw = ggdw; + } + + public String getGgdw() + { + return ggdw; + } + + public void setRksl(String rksl) + { + this.rksl = rksl; + } + + public String getRksl() + { + return rksl; + } + + public void setRkdw(String rkdw) + { + this.rkdw = rkdw; + } + + public String getRkdw() + { + return rkdw; + } + + public void setRksj(Date rksj) + { + this.rksj = rksj; + } + + public Date getRksj() + { + return rksj; + } + + public void setBctj(Long bctj) + { + this.bctj = bctj; + } + + public Long getBctj() + { + return bctj; + } + + public void setZysx(String zysx) + { + this.zysx = zysx; + } + + public String getZysx() + { + return zysx; + } + + public void setGdsqrId(Long gdsqrId) + { + this.gdsqrId = gdsqrId; + } + + public Long getGdsqrId() + { + return gdsqrId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java new file mode 100644 index 0000000..9b03457 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java @@ -0,0 +1,110 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品入库记录-稽查轨迹对象 t_gsp_rkjl_jcgj + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_rkjl_jcgj") +public class GspRkjlJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 供试品入库记录id */ + private Long gspRkId; + + /** 稽查轨迹类型 */ + private String jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Long jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名意义 */ + private String qmyy; + + /** 签名人id */ + private Long qmrId; + + + public void setGspRkId(Long gspRkId) + { + this.gspRkId = gspRkId; + } + + public Long getGspRkId() + { + return gspRkId; + } + + public void setJcgjlx(String jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public String getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Long jcmcys) + { + this.jcmcys = jcmcys; + } + + public Long getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + public void setQmyy(String qmyy) + { + this.qmyy = qmyy; + } + + public String getQmyy() + { + return qmyy; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java new file mode 100644 index 0000000..4bd1be8 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java @@ -0,0 +1,149 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 供试品-台账对象 t_gsp_tz + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_gsp_tz") +public class GspTz extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 供试品id */ + private Long gspId; + + /** 领取人名称 */ + private String lqrMc; + + /** 归还人名称 */ + private String ghrMc; + + /** 发放人名称 */ + private String ffrMc; + + /** 接收人名称 */ + private String jsrMc; + + /** 操作量 */ + private String czl; + + /** 操作量单位 */ + private String czldw; + + /** 签名意义 */ + private String qmyy; + + /** 签名人名称 */ + private String qmrMc; + + /** 签名人id */ + private Long qmrId; + + + public void setGspId(Long gspId) + { + this.gspId = gspId; + } + + public Long getGspId() + { + return gspId; + } + + public void setLqrMc(String lqrMc) + { + this.lqrMc = lqrMc; + } + + public String getLqrMc() + { + return lqrMc; + } + + public void setGhrMc(String ghrMc) + { + this.ghrMc = ghrMc; + } + + public String getGhrMc() + { + return ghrMc; + } + + public void setFfrMc(String ffrMc) + { + this.ffrMc = ffrMc; + } + + public String getFfrMc() + { + return ffrMc; + } + + public void setJsrMc(String jsrMc) + { + this.jsrMc = jsrMc; + } + + public String getJsrMc() + { + return jsrMc; + } + + public void setCzl(String czl) + { + this.czl = czl; + } + + public String getCzl() + { + return czl; + } + + public void setCzldw(String czldw) + { + this.czldw = czldw; + } + + public String getCzldw() + { + return czldw; + } + + public void setQmyy(String qmyy) + { + this.qmyy = qmyy; + } + + public String getQmyy() + { + return qmyy; + } + + public void setQmrMc(String qmrMc) + { + this.qmrMc = qmrMc; + } + + public String getQmrMc() + { + return qmrMc; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java index a99422b..a196b35 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java @@ -28,6 +28,7 @@ public class Sj extends MpBaseEntity private String ssbm; /** 名称 */ + @Compare(name = "名称") private String mc; /** 编号 */ @@ -40,9 +41,11 @@ public class Sj extends MpBaseEntity private String gg; /** 浓度/含量/纯度 */ + @Compare(name = "浓度/含量/纯度") private String nd; /** 浓度单位 */ + @Compare(name = "浓度/含量/纯度单位") private String nddw; /** 库存数量 */ @@ -57,9 +60,11 @@ public class Sj extends MpBaseEntity private String ly; /** 存储条件 */ + @Compare(name = "存储条件") private String cctj; /** 存储位置 */ + @Compare(name = "存储位置") private String ccwz; /** 有效周期 */ @@ -69,6 +74,7 @@ public class Sj extends MpBaseEntity private String yxzqdw; /** 失效日 */ + @Compare(name = "失效日") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxr; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/FfGspForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/FfGspForm.java new file mode 100644 index 0000000..e862e54 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/FfGspForm.java @@ -0,0 +1,193 @@ +package com.hxhq.business.form.gsp; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * @author HanLong + */ +public class FfGspForm { + + /** 供试品id */ + @NotNull(message = "请选择供试品") + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + @NotEmpty(message = "请选择转移条件") + private String zytj; + + /** 目的ids */ + @NotEmpty(message = "请选择目的") + private String mdIds; + + /** 领取人1Id */ + @NotNull(message = "请选择领取人") + private Long lqr1Id; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 领取人1密码 */ + @NotEmpty(message = "请输入领取人密码") + private String lqr1mm; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 发放人1Id */ + @NotNull(message = "请选择发放人") + private Long ffr1Id; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人1密码 */ + @NotEmpty(message = "请输入发放人密码") + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 发放人2密码 */ + private String ffr2mm; + + 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 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 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/gsp/GspBjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspBjForm.java new file mode 100644 index 0000000..3b82855 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspBjForm.java @@ -0,0 +1,198 @@ +package com.hxhq.business.form.gsp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 供试品编辑 + */ +public class GspBjForm { + + /** 供试品id */ + private Long id; + + /** 名称/代号 */ + @NotEmpty(message = "请输入名称/代号") + @Length(max = 50, message = "名称/代号不能超过50字") + private String mc; + + /** 编号 */ + @NotEmpty(message = "请输入编号") + @Length(max = 50, message = "编号不能超过50字") + private String bh; + + /** 批号 */ + @NotEmpty(message = "请输入批号") + @Length(max = 50, message = "批号不能超过50字") + private String ph; + + /** 规格 */ + @NotEmpty(message = "请输入规格") + @Length(max = 10, message = "规格不能超过10字") + private String gg; + + /** 规格单位 */ + @NotEmpty(message = "请选择规格单位") + private String ggdw; + + /** 库存数量 */ + @NotEmpty(message = "请输入库存量") + @Length(max = 10, message = "库存量不能超过10字") + private String kc; + + /** 库存单位 */ + @NotEmpty(message = "请选择库存单位") + private String kcdw; + + /** 有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message = "请选择有效期") + private Date yxq; + + /** 接收日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message = "请选择接收日期") + private Date jsrq; + + /** 存储条件 */ + @NotEmpty(message = "请选择保存条件") + private String cctj; + + /** 注意事项 */ + @NotEmpty(message = "请输入注意事项") + private String zysx; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入签名人密码") + private String qmrmm; + + /** 编辑备注 */ + private String bjbz; + + public String getBjbz() { + return bjbz; + } + + public void setBjbz(String bjbz) { + this.bjbz = bjbz; + } + + 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 getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getGg() { + return gg; + } + + public void setGg(String gg) { + this.gg = gg; + } + + public String getGgdw() { + return ggdw; + } + + public void setGgdw(String ggdw) { + this.ggdw = ggdw; + } + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public Date getYxq() { + return yxq; + } + + public void setYxq(Date yxq) { + this.yxq = yxq; + } + + public Date getJsrq() { + return jsrq; + } + + public void setJsrq(Date jsrq) { + this.jsrq = jsrq; + } + + public String getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getZysx() { + return zysx; + } + + public void setZysx(String zysx) { + this.zysx = zysx; + } + + public 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/gsp/GspCzForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspCzForm.java new file mode 100644 index 0000000..2ced9df --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspCzForm.java @@ -0,0 +1,82 @@ +package com.hxhq.business.form.gsp; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 供试品处置 + * @author HanLong + */ +public class GspCzForm { + + /** 供试品id */ + @NotNull(message = "请选择处置供试品") + private Long id; + + /** 处置原因 */ + @NotEmpty(message = "请输入处置原因") + private String remark; + + /** 处置量 */ + @NotEmpty(message = "请输入处置量") + private String czl; + + /** 处置方式 */ + @NotEmpty(message = "请选择处置方式") + private String czfs; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入签名人密码") + 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 String getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + 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/gsp/GspForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspForm.java new file mode 100644 index 0000000..52b1529 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspForm.java @@ -0,0 +1,197 @@ +package com.hxhq.business.form.gsp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 供试品编辑 + */ +public class GspForm { + + /** 供试品id */ + private Long id; + + /** 名称/代号 */ + @NotEmpty(message = "请输入名称/代号") + @Length(max = 50, message = "名称/代号不能超过50字") + private String mc; + + /** 编号 */ + @NotEmpty(message = "请输入编号") + @Length(max = 50, message = "编号不能超过50字") + private String bh; + + /** 批号 */ + @NotEmpty(message = "请输入批号") + @Length(max = 50, message = "批号不能超过50字") + private String ph; + + /** 规格 */ + @NotEmpty(message = "请输入规格") + @Length(max = 10, message = "规格不能超过10字") + private String gg; + + /** 规格单位 */ + @NotEmpty(message = "请选择规格单位") + private String ggdw; + + /** 库存数量 */ + @NotEmpty(message = "请输入库存量") + @Length(max = 10, message = "库存量不能超过10字") + private String kc; + + /** 库存单位 */ + @NotEmpty(message = "请选择库存单位") + private String kcdw; + + /** 有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message = "请选择有效期") + private Date yxq; + + /** 接收日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message = "请选择接收日期") + private Date jsrq; + + /** 存储条件 */ + @NotEmpty(message = "请选择保存条件") + private String cctj; + + /** 注意事项 */ + @NotEmpty(message = "请输入注意事项") + private String zysx; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入签名人密码") + private String qmrmm; + + private String qmbz; + + public String getQmbz() { + return qmbz; + } + + public void setQmbz(String qmbz) { + this.qmbz = qmbz; + } + + 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 getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getGg() { + return gg; + } + + public void setGg(String gg) { + this.gg = gg; + } + + public String getGgdw() { + return ggdw; + } + + public void setGgdw(String ggdw) { + this.ggdw = ggdw; + } + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public Date getYxq() { + return yxq; + } + + public void setYxq(Date yxq) { + this.yxq = yxq; + } + + public Date getJsrq() { + return jsrq; + } + + public void setJsrq(Date jsrq) { + this.jsrq = jsrq; + } + + public String getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getZysx() { + return zysx; + } + + public void setZysx(String zysx) { + this.zysx = zysx; + } + + public 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/gsp/GspGdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspGdForm.java new file mode 100644 index 0000000..9315b19 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspGdForm.java @@ -0,0 +1,66 @@ +package com.hxhq.business.form.gsp; + +import javax.validation.constraints.NotEmpty; + +/** + * 供试品-归档 + * @author 15881 + */ +public class GspGdForm { + + /** 供试品id */ + private Long id; + + /** 供试品ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入密码") + 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/gsp/GspGhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspGhForm.java new file mode 100644 index 0000000..64f5843 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspGhForm.java @@ -0,0 +1,153 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品-归还 + * @author 15881 + */ +public class GspGhForm { + + /** 供试品id */ + private Long id; + + /** 归还转移条件 */ + private String ghzytj; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + + /** 归还人1id */ + private Long ghr1Id; + + + /** 归还人1密码 */ + private String ghr1mm; + + /** 归还人2id */ + private Long ghr2Id; + + /** 归还人2密码 */ + private String ghr2mm; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人1密码 */ + private String jsr1mm; + + /** 接收人2id */ + private Long jsr2Id; + + /** 接收人2密码 */ + private String jsr2mm; + + /** 备注 */ + private String remark; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGhzytj() { + return ghzytj; + } + + public void setGhzytj(String ghzytj) { + this.ghzytj = ghzytj; + } + + 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 Long getGhr1Id() { + return ghr1Id; + } + + public void setGhr1Id(Long ghr1Id) { + this.ghr1Id = ghr1Id; + } + + public String getGhr1mm() { + return ghr1mm; + } + + public void setGhr1mm(String ghr1mm) { + this.ghr1mm = ghr1mm; + } + + public Long getGhr2Id() { + return ghr2Id; + } + + public void setGhr2Id(Long ghr2Id) { + this.ghr2Id = ghr2Id; + } + + public String getGhr2mm() { + return ghr2mm; + } + + public void setGhr2mm(String ghr2mm) { + this.ghr2mm = ghr2mm; + } + + public Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public String getJsr1mm() { + return jsr1mm; + } + + public void setJsr1mm(String jsr1mm) { + this.jsr1mm = jsr1mm; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public String getJsr2mm() { + return jsr2mm; + } + + public void setJsr2mm(String jsr2mm) { + this.jsr2mm = jsr2mm; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJdForm.java new file mode 100644 index 0000000..553ab13 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJdForm.java @@ -0,0 +1,57 @@ +package com.hxhq.business.form.gsp; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 供试品-解档 + * @author 15881 + */ +public class GspJdForm { + + /** 供试品id */ + @NotNull(message = "请选择操作对象") + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入密码") + 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/gsp/GspJsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJsForm.java new file mode 100644 index 0000000..43b1feb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJsForm.java @@ -0,0 +1,52 @@ +package com.hxhq.business.form.gsp; + +/** + * 解锁供试品 + * @author HanLong + */ +public class GspJsForm { + + /** 供试品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/gsp/GspJyForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java new file mode 100644 index 0000000..37958ae --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspJyForm.java @@ -0,0 +1,86 @@ +package com.hxhq.business.form.gsp; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 供试品-借阅 + * @author HanLong + */ +public class GspJyForm { + + /** 供试品id */ + @NotNull(message = "请选择操作对象") + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + @NotEmpty(message = "请输入密码") + private String qmrmm; + + /** 日期开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "请选择借阅日期") + private Date startDate; + + /** 日期结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "请选择借阅日期") + private Date 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; + } + + 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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java new file mode 100644 index 0000000..d18a712 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspListForm.java @@ -0,0 +1,91 @@ +package com.hxhq.business.form.gsp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 供试品列表 + */ +public class GspListForm { + + /** 名称/代号 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 批号 */ + private String ph; + + /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */ + private Integer zjzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 有效期开始日期 */ + private String startDate; + + /** 有效期结束日期 */ + private String endDate; + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public Integer getZjzt() { + return zjzt; + } + + public void setZjzt(Integer zjzt) { + this.zjzt = zjzt; + } + + public Integer getJyzt() { + return jyzt; + } + + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlczForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlczForm.java new file mode 100644 index 0000000..4260e12 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlczForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.gsp; + +import com.hxhq.business.form.sj.PlczSjItemForm; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 批量处置供试品 + * @author HanLong + */ +public class GspPlczForm { + + @NotNull(message = "处置对象不能为空") + private List list; + /** + * 签名人id + */ + private Long qmrId; + + /** + * 签名人密码 + */ + @NotEmpty(message = "请输入签名人密码") + private String qmrmm; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + 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/gsp/GspPlczItemForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlczItemForm.java new file mode 100644 index 0000000..ef2f6e1 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlczItemForm.java @@ -0,0 +1,60 @@ +package com.hxhq.business.form.gsp; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 批量处置供试品-对象 + * @author HanLong + */ +public class GspPlczItemForm { + + /** 供试品id */ + @NotNull(message = "请选择处置供试品") + private Long id; + + /** 处置原因 */ + @NotEmpty(message = "请输入处置原因") + private String remark; + + /** 处置量 */ + @NotEmpty(message = "请输入处置量") + private String czl; + + /** 处置方式 */ + @NotEmpty(message = "请选择处置方式") + private String czfs; + + 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 getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } + + 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/gsp/GspPlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlffForm.java new file mode 100644 index 0000000..20fb47a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlffForm.java @@ -0,0 +1,155 @@ +package com.hxhq.business.form.gsp; + +import com.hxhq.business.form.mjy.PlffItem; + +import java.util.List; + +/** + * 供试品批量发放 + * @author 15881 + */ +public class GspPlffForm { + + /** 供试品发放列表 */ + private List list; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 发放人2密码 */ + private String ffr2mm; + + 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 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/gsp/GspPlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlffItem.java new file mode 100644 index 0000000..6c57491 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspPlffItem.java @@ -0,0 +1,54 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品批量发放单一对象 + * @author 15881 + */ +public class GspPlffItem { + + /** 供试品id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 目的ids */ + private String mdIds; + + 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; + } + + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSdForm.java new file mode 100644 index 0000000..df97e60 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspSdForm.java @@ -0,0 +1,63 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品锁定 + * @author HanLong + */ +public class GspSdForm { + + /** 供试品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/gsp/GspShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspShbjForm.java new file mode 100644 index 0000000..c4ab281 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspShbjForm.java @@ -0,0 +1,63 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品-审核编辑 + * @author 15881 + */ +public class GspShbjForm { + + /** 供试品id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private Integer 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 Integer getQmyy() { + return qmyy; + } + + public void setQmyy(Integer qmyy) { + this.qmyy = qmyy; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspShxgkcForm.java new file mode 100644 index 0000000..15a62c4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspShxgkcForm.java @@ -0,0 +1,87 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品-审核修改库存 + * @author 15881 + */ +public class GspShxgkcForm { + + /** 供试品id */ + private Long id; + + /** 库存编辑 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private Integer qmyy; + + public Integer getQmyy() { + return qmyy; + } + + public void setQmyy(Integer 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/gsp/GspXgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspXgkcForm.java new file mode 100644 index 0000000..8c2be79 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspXgkcForm.java @@ -0,0 +1,78 @@ +package com.hxhq.business.form.gsp; + +import com.hxhq.common.core.annotation.Compare; + +/** + * 供试品修改库存 + * @author HanLong + */ +public class GspXgkcForm { + + /** 供试品id */ + private Long id; + + /** 库存 */ + @Compare(name = "库存") + private String kc; + + /** 库存单位 */ + @Compare(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/gsp/GspYsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspYsffForm.java new file mode 100644 index 0000000..5f2d18f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspYsffForm.java @@ -0,0 +1,151 @@ +package com.hxhq.business.form.gsp; + +/** + * 供试品钥匙发放 + * @author HanLong + */ +public class GspYsffForm { + + /** 供试品id */ + private Long id; + + /** 供试品ids */ + private Long[] ids; + + /** 暂存柜id */ + private Long zcgId; + + /** 备注 */ + private String remark; + + /** 钥匙1领取人ID */ + private Long lqr1Id; + + /** 钥匙1领取人名称 */ + private String lqr1Mc; + + /** 钥匙2领取人ID */ + private Long lqr2Id; + + /** 钥匙2领取人名称 */ + private String lqr2Mc; + + /** 钥匙1领取人密码 */ + private String lqr1mm; + + /** 钥匙2领取人密码 */ + private String lqr2mm; + + /** 发放人 */ + private Long ffrId; + + /** 发放人 */ + private String ffrMc; + + /** 发放人密码 */ + private String ffrmm; + + 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 getFfrMc() { + return ffrMc; + } + + public void setFfrMc(String ffrMc) { + this.ffrMc = ffrMc; + } + + 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/form/sj/JySjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/JySjForm.java index c331dd0..1dd30f3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/JySjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/JySjForm.java @@ -28,12 +28,12 @@ public class JySjForm { /** 日期开始 */ @JsonFormat(pattern = "yyyy-MM-dd") - @NotNull(message = "借阅日期不能为空") + @NotNull(message = "请选择借阅日期") private Date startDate; /** 日期结束 */ @JsonFormat(pattern = "yyyy-MM-dd") - @NotNull(message = "借阅日期不能为空") + @NotNull(message = "请选择借阅日期") private Date endDate; public Long getId() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjBjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjBjForm.java new file mode 100644 index 0000000..ddfaf8f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjBjForm.java @@ -0,0 +1,133 @@ +package com.hxhq.business.form.sj; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.common.core.annotation.Compare; + +import java.util.Date; + +/** + * 试剂编辑 + */ +public class SjBjForm { + + private Long id; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 浓度/含量/纯度 */ + private String nd; + + /** 浓度单位 */ + private String nddw; + + /** 存储条件 */ + private String cctj; + + /** 存储位置 */ + private String ccwz; + + /** 失效日 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名备注 */ + private String qmbz; + + 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 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 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 Date getSxr() { + return sxr; + } + + public void setSxr(Date sxr) { + this.sxr = sxr; + } + + 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 getQmbz() { + return qmbz; + } + + public void setQmbz(String qmbz) { + this.qmbz = qmbz; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlJcgjMapper.java new file mode 100644 index 0000000..00b1708 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspFfjlJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品发放记录-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspFfjlJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlMapper.java new file mode 100644 index 0000000..bc312be --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspFfjl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品发放记录Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspFfjlMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspJcgjMapper.java new file mode 100644 index 0000000..ac85d1c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品管理-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java new file mode 100644 index 0000000..20e82f2 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.Gsp; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品管理Mapper接口 + * + * @author HanLong + * @date 2025-12-30 + */ +public interface GspMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlJcgjMapper.java new file mode 100644 index 0000000..c53820b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspRkjlJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品入库记录-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspRkjlJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlMapper.java new file mode 100644 index 0000000..98672e3 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspRkjl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品入库记录Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspRkjlMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspTzMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspTzMapper.java new file mode 100644 index 0000000..4effe20 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspTzMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.GspTz; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 供试品-台账Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface GspTzMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java new file mode 100644 index 0000000..9546a57 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java @@ -0,0 +1,34 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.GspFfjlJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 供试品发放记录-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspFfjlJcgjService extends IService +{ + /** + * 查询供试品发放记录-稽查轨迹列表 + * + * @param gspFfjlJcgj 供试品发放记录-稽查轨迹 + * @return 供试品发放记录-稽查轨迹集合 + */ + public List queryList(GspFfjlJcgj gspFfjlJcgj); + + /** + * 新增稽查轨迹 + * @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/IGspFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java new file mode 100644 index 0000000..49580e4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java @@ -0,0 +1,113 @@ +package com.hxhq.business.service; + +import java.util.Date; +import java.util.List; + +import com.hxhq.business.domain.Gsp; +import com.hxhq.business.domain.GspFfjl; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.Mjy; +import com.hxhq.business.domain.MjyFfjl; +import com.hxhq.business.dto.mjy.FfjlDetailDto; +import com.hxhq.business.form.gsp.GspGhForm; +import com.hxhq.business.form.mjy.*; +import com.hxhq.system.api.domain.SysUser; + +/** + * 供试品发放记录Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspFfjlService extends IService +{ + /** + * 查询供试品发放记录列表 + * + * @param gspFfjl 供试品发放记录 + * @return 供试品发放记录集合 + */ + public List queryList(GspFfjl gspFfjl); + + /** + * 详情 + * + * @param gspId + * @return + */ + public GspFfjl queryLastInfoByGspId(Long gspId); + + /** + * 发放 + * @param ckl 出库量 + * @param ckdw 出库单位 + * @param zytj 转移条件 + * @param remark 备注 + * @param mdIds 目标 + * @param gsp 供试品 + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param time 发放时间 + */ + public void ff(String ckl, String ckdw, String zytj, String remark, String mdIds, Gsp gsp, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); + + /** + * 归还 + * @param form 归还数据 + * @param gsp 供试品 + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 + */ + void gh(GspGhForm form, Gsp gsp, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2); + + /** 解档 */ + void jd(FfjlJdForm form); + + /** 批量归档 */ + void plgd(FfjlGdForm form); + + /** 归档 */ + void gd(FfjlGdForm form); + + /** + * 批量锁定 + * + * @param form + */ + public void plsd(FfjlSdForm form); + + /** + * 锁定 + * + * @param form + */ + public void sd(FfjlSdForm form); + + /** + * 解锁 + * + * @param form + */ + public void js(FfjlJsForm form); + + + /** + * 借阅 + * + * @param form + */ + public void jy(FfjlJyForm form); + + + /** + * 加签 + * + * @param form + */ + public void jq(FfjlJqForm form); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java new file mode 100644 index 0000000..cae935c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java @@ -0,0 +1,34 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.GspJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 供试品管理-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspJcgjService extends IService +{ + /** + * 查询供试品管理-稽查轨迹列表 + * + * @param gspJcgj 供试品管理-稽查轨迹 + * @return 供试品管理-稽查轨迹集合 + */ + public List queryList(GspJcgj gspJcgj); + + /** + * 新增稽查轨迹 + * @param gspId 供试品id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + public void saveJcgj(Long gspId, 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/IGspRkjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java new file mode 100644 index 0000000..ea21459 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.GspRkjlJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 供试品入库记录-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspRkjlJcgjService extends IService +{ + /** + * 查询供试品入库记录-稽查轨迹列表 + * + * @param gspRkjlJcgj 供试品入库记录-稽查轨迹 + * @return 供试品入库记录-稽查轨迹集合 + */ + public List queryList(GspRkjlJcgj gspRkjlJcgj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java new file mode 100644 index 0000000..b54f7d6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.GspRkjl; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 供试品入库记录Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspRkjlService extends IService +{ + /** + * 查询供试品入库记录列表 + * + * @param gspRkjl 供试品入库记录 + * @return 供试品入库记录集合 + */ + public List queryList(GspRkjl gspRkjl); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java new file mode 100644 index 0000000..06a7d36 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java @@ -0,0 +1,86 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.Gsp; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.form.gsp.*; +import com.hxhq.business.form.mjy.XgkcForm; +import com.hxhq.business.form.sj.CzSjForm; + +/** + * 供试品管理Service接口 + * + * @author HanLong + * @date 2025-12-30 + */ +public interface IGspService extends IService +{ + /** + * 查询供试品管理列表 + * + * @param form 供试品列表参数 + * @return 供试品管理集合 + */ + public List queryList(GspListForm form); + + /** + * 新增供试品 + * @param gspForm 供试品表单 + */ + void save(GspForm gspForm); + + /** + * 编辑供试品 + * @param gspForm 供试品编辑表单 + */ + void edit(GspBjForm gspForm); + + /** 审核编辑 */ + void shbj(GspShbjForm form); + + /** 钥匙发放 */ + void ysff(GspYsffForm form); + + /** 发放 */ + void ff(FfGspForm form); + + /** 批量发放 */ + void plff(GspPlffForm form); + + /** 修改库存 */ + void xgkc(GspXgkcForm form); + + /** 审核修改库存 */ + void shxgkc(GspShxgkcForm form); + + /** 批量锁定 */ + void plsd(GspSdForm form); + + /** 锁定 */ + void sd(GspSdForm form); + + /** 解锁 */ + void js(GspJsForm form); + + /** 处置 */ + void cz(GspCzForm form); + + /** 批量处置 */ + void plcz(GspPlczForm form); + + /** 借阅 */ + void jy(GspJyForm form); + + /** 解档 */ + void jd(GspJdForm form); + + /** 供试品归档 */ + void gd(GspGdForm form); + + /** 批量归档 */ + void plgd(GspGdForm form); + + /** 归还 */ + void gh(GspGhForm form); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java new file mode 100644 index 0000000..4523f66 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java @@ -0,0 +1,38 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.GspTz; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 供试品-台账Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IGspTzService extends IService +{ + /** + * 查询供试品-台账列表 + * + * @param gspTz 供试品-台账 + * @return 供试品-台账集合 + */ + public List queryList(GspTz gspTz); + + /** + * 新增台账 + * @param gspId 供试品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 gspId, 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/ISjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java index c995e47..a9884d2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java @@ -50,5 +50,9 @@ public interface ISjService extends IService void gd(GdSjForm form); /** 批量归档 */ - void plgd(GdForm form); + void plgd(GdSjForm form); + + /** 编辑 */ + void bj(SjBjForm form); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java new file mode 100644 index 0000000..1830423 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java @@ -0,0 +1,52 @@ +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.MjyFfjlJcgj; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspFfjlJcgjMapper; +import com.hxhq.business.domain.GspFfjlJcgj; +import com.hxhq.business.service.IGspFfjlJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 供试品发放记录-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspFfjlJcgjServiceImpl extends ServiceImpl implements IGspFfjlJcgjService +{ + /** + * 查询供试品发放记录-稽查轨迹列表 + * + * @param gspFfjlJcgj 供试品发放记录-稽查轨迹 + * @return 供试品发放记录-稽查轨迹 + */ + @Override + public List queryList(GspFfjlJcgj gspFfjlJcgj) + { + QueryWrapper queryWrapper = Wrappers.query(); + if(gspFfjlJcgj.getFfjlId() != null) { + queryWrapper.eq("ffjl_id", gspFfjlJcgj.getFfjlId()); + } + queryWrapper.orderByDesc("id"); + return this.list(queryWrapper); + } + + @Override + public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) { + GspFfjlJcgj gspFfjlJcgj = new GspFfjlJcgj(); + gspFfjlJcgj.setFfjlId(ffjlId); + gspFfjlJcgj.setJcgjlx(jcgjlx); + gspFfjlJcgj.setJcmc(jcmc); + gspFfjlJcgj.setJcmcys(jcmcys); + gspFfjlJcgj.setJcnr(jcnr); + gspFfjlJcgj.setQmrId(jcrId); + gspFfjlJcgj.setQmrMc(jcrMc); + this.save(gspFfjlJcgj); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java new file mode 100644 index 0000000..0ff0420 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java @@ -0,0 +1,447 @@ +package com.hxhq.business.service.impl; + +import java.math.BigDecimal; +import java.util.*; + +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.FfjlDetailDto; +import com.hxhq.business.enums.zykgl.JcgjlxEnum; +import com.hxhq.business.enums.zykgl.JcmcysEnum; +import com.hxhq.business.enums.zykgl.JlztEnum; +import com.hxhq.business.enums.zykgl.JyztEnum; +import com.hxhq.business.form.gsp.GspGhForm; +import com.hxhq.business.form.mjy.*; +import com.hxhq.business.service.IGspFfjlJcgjService; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.common.core.exception.ServiceException; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; +import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspFfjlMapper; +import com.hxhq.business.service.IGspFfjlService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +/** + * 供试品发放记录Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspFfjlServiceImpl extends ServiceImpl implements IGspFfjlService +{ + + @Autowired + private IGspFfjlJcgjService gspFfjlJcgjService; + + @Autowired + private ISysUserService sysUserService; + + /** + * 查询供试品发放记录列表 + * + * @param gspFfjl 供试品发放记录 + * @return 供试品发放记录 + */ + @Override + public List queryList(GspFfjl gspFfjl) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + + @Override + public GspFfjl queryLastInfoByGspId(Long gspId) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("gsp_id", gspId); + queryWrapper.orderByDesc("id"); + return this.getOne(queryWrapper, false); + } + + @Override + public void ff(String ckl, String ckdw, String zytj, String remark, String mdIds, Gsp gsp, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) { + GspFfjl gspFfjl = new GspFfjl(); + gspFfjl.setGspId(gsp.getId()); + gspFfjl.setMc(gsp.getMc()); + gspFfjl.setBh(gsp.getBh()); + gspFfjl.setPh(gsp.getPh()); + gspFfjl.setGg(gsp.getGg()); + gspFfjl.setGgdw(gsp.getGgdw()); + gspFfjl.setYxq(gsp.getYxq()); + gspFfjl.setCctj(gsp.getCctj()); + gspFfjl.setJsrq(gsp.getJsrq()); + gspFfjl.setFfzytj(zytj); + gspFfjl.setCkl(ckl); + gspFfjl.setCkldw(ckdw); + gspFfjl.setJyzt(JyztEnum.wjy.getValue()); + gspFfjl.setJlzt(JlztEnum.wsd.getValue()); + + gspFfjl.setLqr1Id(lqr1.getUserId()); + gspFfjl.setLqr1Mc(lqr1.getNickName()); + if(lqr2 != null) { + gspFfjl.setLqr2Id(lqr2.getUserId()); + gspFfjl.setLqr2Mc(lqr2.getNickName()); + } + gspFfjl.setFfr1Id(ffr1.getUserId()); + gspFfjl.setFfr1Mc(ffr1.getNickName()); + if(ffr2 != null) { + gspFfjl.setFfr2Id(ffr2.getUserId()); + gspFfjl.setFfr2Mc(ffr2.getNickName()); + } + gspFfjl.setFfzytj(zytj); + gspFfjl.setFfrq(time); + gspFfjl.setFfbz(remark); + gspFfjl.setMdIds(mdIds); + this.save(gspFfjl); + + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gsp.getKc() + gsp.getKcdw()); + formData.put("转移条件", zytj); + formData.put("目的", mdIds); + formData.put("备注", remark); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), + SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //endregion + } + + @Override + public void gh(GspGhForm form, Gsp gsp, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2) { + GspFfjl gspFfjl = this.queryLastInfoByGspId(gsp.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录不存在或已删除"); + } + if(!NumberUtils.isParsable(form.getRkl())) { + throw new ServiceException("请填写正确的入库量"); + } + BigDecimal rkl = new BigDecimal(form.getRkl()); + BigDecimal ckl = new BigDecimal(gspFfjl.getCkl()); + if(rkl.compareTo(ckl) > 0) { + throw new ServiceException("入库量不应大于出库量"); + } + BigDecimal syl = ckl.subtract(rkl); + gspFfjl.setSyl(syl.toString()); + gspFfjl.setSyldw(gspFfjl.getCkldw()); + gspFfjl.setGhzytj(form.getGhzytj()); + gspFfjl.setRkl(form.getRkl()); + gspFfjl.setRkldw(form.getRkldw()); + gspFfjl.setGhr1Id(ghr1.getUserId()); + gspFfjl.setGhr1Mc(ghr1.getNickName()); + if(ghr2 != null) { + gspFfjl.setGhr2Id(ghr2.getUserId()); + gspFfjl.setGhr2Mc(ghr2.getNickName()); + } + gspFfjl.setGhrq(new Date()); + + gspFfjl.setJsr1Id(jsr1.getUserId()); + gspFfjl.setJsr1Mc(jsr1.getNickName()); + if(jsr2 != null) { + gspFfjl.setJsr2Id(jsr2.getUserId()); + gspFfjl.setJsr2Mc(jsr2.getNickName()); + } + gspFfjl.setGhbz(form.getRemark()); + this.updateById(gspFfjl); + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("转移条件", form.getGhzytj()); + formData.put("入库量", form.getRkl() + form.getRkldw()); + formData.put("归还人1", ghr1.getNickName()); + if(ghr2 != null) { + formData.put("归还人2", ghr2.getNickName()); + } + formData.put("库管员1", jsr1.getNickName()); + if(jsr2 != null) { + formData.put("库管员2", jsr2.getNickName()); + } + formData.put("备注", form.getRemark()); + formData.put("签名意义", "归还"); + gspFfjlJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //endregion + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void jd(FfjlJdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.gd.getValue())) { + throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】未归档，不能解档"); + } + //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作； + gspFfjl.setJlzt(JlztEnum.djd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请解档"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void plgd(FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new ServiceException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List gspFfjlList = this.list(queryWrapper); + List gspFfjlJcgjList = new ArrayList<>(); + if (gspFfjlList.size() > 0) { + for (GspFfjl gspFfjl : gspFfjlList) { + if (!gspFfjl.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】不是锁定状态，不能归档"); + } + } + for (GspFfjl gspFfjl : gspFfjlList) { + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gspFfjl.setJlzt(JlztEnum.dgd.getValue()); + + //region 稽查轨迹 + GspFfjlJcgj gspFfjlJcgj = new GspFfjlJcgj(); + gspFfjlJcgj.setFfjlId(gspFfjl.getId()); + gspFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspFfjlJcgj.setJcmc("申请归档"); + gspFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请归档"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); + gspFfjlJcgj.setQmrId(SecurityUtils.getUserId()); + gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspFfjlJcgjList.add(gspFfjlJcgj); + //endregion + + } + this.saveOrUpdateBatch(gspFfjlList); + gspFfjlJcgjService.saveBatch(gspFfjlJcgjList); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void gd(FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gspFfjl.setJlzt(JlztEnum.dgd.getValue()); + gspFfjl.setGdsqrId(qmr.getUserId()); + gspFfjl.setGdsqrMc(qmr.getNickName()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "申请归档"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + } + + /** + * 批量锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plsd(FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new ServiceException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("jlzt", JlztEnum.wsd.getValue()); + List gspFfjlList = this.list(queryWrapper); + List gspFfjlJcgjList = new ArrayList<>(); + if (gspFfjlList.size() <= form.getIds().length) { + throw new ServiceException("发放记录发放记录不是未锁定状态，不能锁定"); + } + for (GspFfjl gspFfjl : gspFfjlList) { + //锁定 + gspFfjl.setJlzt(JlztEnum.ysd.getValue()); + + //region 稽查轨迹 + GspFfjlJcgj gspFfjlJcgj = new GspFfjlJcgj(); + gspFfjlJcgj.setFfjlId(gspFfjl.getId()); + gspFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspFfjlJcgj.setJcmc("锁定发放记录"); + gspFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定发放记录"); + formData.put("签名人", qmr.getNickName()); + + gspFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); + gspFfjlJcgj.setQmrId(SecurityUtils.getUserId()); + gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspFfjlJcgjList.add(gspFfjlJcgj); + //endregion + + } + this.saveOrUpdateBatch(gspFfjlList); + gspFfjlJcgjService.saveBatch(gspFfjlJcgjList); + + } + + /** + * 锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void sd(FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.wsd.getValue())) { + throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】不是未锁定状态，不能锁定"); + } + gspFfjl.setJlzt(JlztEnum.ysd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "锁定发放记录"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + } + + + /** + * 解锁 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void js(FfjlJsForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】不是已锁定状态，不能解锁"); + } + //点击解锁，状态更新为入库； + gspFfjl.setJlzt(JlztEnum.wsd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "解锁发放记录"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + } + + /** + * 借阅 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jy(FfjlJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.gd.getValue())) { + throw new ServiceException("发放记录【" + gspFfjl.getMc() + "】不是归档状态，不能借阅"); + } + if (!gspFfjl.getJyzt().equals(JyztEnum.wjy.getValue())) { + throw new ServiceException("发放记录【" + gspFfjl.getMc() + "】不是未借阅状态，不能借阅"); + } + //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； + gspFfjl.setJyzt(JyztEnum.djy.getValue()); + gspFfjl.setJyksrq(form.getStartDate()); + gspFfjl.setJyjsrq(form.getEndDate()); + this.updateById(gspFfjl); + //稽查轨迹 + 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()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + } + + /** + * 加签 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jq(FfjlJqForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new ServiceException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.wsd.getValue())) { + throw new ServiceException("发放记录【" + gspFfjl.getMc() + "】不是未锁定状态，不能加签"); + } + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "补充说明"); + formData.put("签名人", qmr.getNickName()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java new file mode 100644 index 0000000..6ce728f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java @@ -0,0 +1,65 @@ +package com.hxhq.business.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.MjyJcgj; +import com.hxhq.business.domain.SjJcgj; +import com.hxhq.common.core.domain.MpBaseEntity; +import com.hxhq.common.core.utils.StringUtils; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspJcgjMapper; +import com.hxhq.business.domain.GspJcgj; +import com.hxhq.business.service.IGspJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 供试品管理-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspJcgjServiceImpl extends ServiceImpl implements IGspJcgjService +{ + /** + * 查询供试品管理-稽查轨迹列表 + * + * @param gspJcgj 供试品管理-稽查轨迹 + * @return 供试品管理-稽查轨迹 + */ + @Override + public List queryList(GspJcgj gspJcgj) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (gspJcgj.getGspId() == null || gspJcgj.getGspId().longValue() < 0) { + throw new SecurityException("供试品id不能为空"); + } + queryWrapper.eq(GspJcgj::getGspId, gspJcgj.getGspId()); + if (gspJcgj.getJcgjlx() != null && gspJcgj.getJcgjlx().intValue() > 0) { + queryWrapper.eq(GspJcgj::getJcgjlx, gspJcgj.getJcgjlx()); + } + if (StringUtils.isNoneBlank(gspJcgj.getJcmc())) { + queryWrapper.and(p -> p.like(GspJcgj::getJcmc, gspJcgj.getJcmc()) + .or().like(GspJcgj::getJcgjlx, gspJcgj.getJcmc())); + } + queryWrapper.orderByDesc(MpBaseEntity::getId); + return this.list(queryWrapper); + } + + @Override + public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) { + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspId); + gspJcgj.setJcgjlx(jcgjlx); + gspJcgj.setJcmc(jcmc); + gspJcgj.setJcmcys(jcmcys); + gspJcgj.setJcnr(jcnr); + gspJcgj.setQmrId(jcrId); + gspJcgj.setQmrMc(jcrMc); + this.save(gspJcgj); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java new file mode 100644 index 0000000..e4f9de4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java @@ -0,0 +1,34 @@ +package com.hxhq.business.service.impl; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspRkjlJcgjMapper; +import com.hxhq.business.domain.GspRkjlJcgj; +import com.hxhq.business.service.IGspRkjlJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 供试品入库记录-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspRkjlJcgjServiceImpl extends ServiceImpl implements IGspRkjlJcgjService +{ + /** + * 查询供试品入库记录-稽查轨迹列表 + * + * @param gspRkjlJcgj 供试品入库记录-稽查轨迹 + * @return 供试品入库记录-稽查轨迹 + */ + @Override + public List queryList(GspRkjlJcgj gspRkjlJcgj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java new file mode 100644 index 0000000..f80fddd --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java @@ -0,0 +1,34 @@ +package com.hxhq.business.service.impl; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspRkjlMapper; +import com.hxhq.business.domain.GspRkjl; +import com.hxhq.business.service.IGspRkjlService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 供试品入库记录Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspRkjlServiceImpl extends ServiceImpl implements IGspRkjlService +{ + /** + * 查询供试品入库记录列表 + * + * @param gspRkjl 供试品入库记录 + * @return 供试品入库记录 + */ + @Override + public List queryList(GspRkjl gspRkjl) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java new file mode 100644 index 0000000..5c3b4d6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -0,0 +1,901 @@ +package com.hxhq.business.service.impl; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.*; +import com.hxhq.business.enums.zykgl.*; +import com.hxhq.business.form.gsp.*; +import com.hxhq.business.form.mjy.PlffItem; +import com.hxhq.business.form.sj.PlczSjItemForm; +import com.hxhq.business.service.*; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.common.core.exception.ServiceException; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +/** + * 供试品管理Service业务层处理 + * + * @author HanLong + * @date 2025-12-30 + */ +@Service +public class GspServiceImpl extends ServiceImpl implements IGspService { + @Autowired + private ISysUserService sysUserService; + + @Autowired + private IGspJcgjService gspJcgjService; + + @Autowired + private IGspTzService gspTzService; + + @Autowired + private IGspFfjlService gspFfjlService; + + @Autowired + private IZcgService zcgService; + + /** + * 查询供试品管理列表 + * + * @param form 供试品列表参数 + * @return 供试品管理 + */ + @Override + public List queryList(GspListForm form) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotEmpty(form.getMc())) { + queryWrapper.like(Gsp::getMc, form.getMc()); + } + if(StringUtils.isNotEmpty(form.getBh())) { + queryWrapper.like(Gsp::getBh, form.getBh()); + } + if(StringUtils.isNotEmpty(form.getPh())) { + queryWrapper.like(Gsp::getPh, form.getPh()); + } + if(StringUtils.isNotEmpty(form.getStartDate())) { + queryWrapper.ge(Gsp::getYxq, form.getStartDate()); + } + if(StringUtils.isNotEmpty(form.getEndDate())) { + queryWrapper.le(Gsp::getYxq, form.getEndDate()); + } + if(form.getJyzt() != null) { + queryWrapper.eq(Gsp::getJyzt, form.getJyzt()); + } + if(form.getZjzt() != null) { + queryWrapper.eq(Gsp::getZjzt, form.getZjzt()); + } + return this.list(queryWrapper); + } + + @Override + public void save(GspForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + + Gsp gsp = new Gsp(); + BeanUtils.copyProperties(form, gsp); + gsp.setZjzt(ZjztEnum.rk.getValue()); + gsp.setJyzt(JyztEnum.wjy.getValue()); + gsp.setBjzt(BjEnum.wbj.getValue()); + gsp.setKcbjzt(KcbjEnum.wbj.getValue()); + save(gsp); + + + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gsp.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("新增供试品"); + gspJcgj.setJcmcys(JcmcysEnum.blue.getValue()); + gspJcgj.setRemark(form.getQmbz()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgjService.save(gspJcgj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void edit(GspBjForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + + + Gsp gspOld = this.getById(form.getId()); + if(gspOld == null) { + throw new ServiceException("供试品不存在"); + } else if(gspOld.getZjzt() != ZjztEnum.rk.getValue()) { + throw new ServiceException("供试品【" + gspOld.getZjzt() + "】不是入库状态，不能编辑"); + } else if (!gspOld.getBjzt().equals(BjEnum.wbj.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】已经提交编辑申请，请等待审核"); + } + + List fieldChanges = ObjectCompareUtil.compareObjects(gspOld, form); + if (fieldChanges.size() == 0) { + throw new ServiceException("你没有修改任何内容"); + } + + gspOld.setMcbj(form.getMc()); + gspOld.setPhbj(form.getPh()); + gspOld.setGgbj(form.getGg()); + gspOld.setGgdwbj(form.getGgdw()); + gspOld.setYxqbj(form.getYxq()); + gspOld.setJsrqbj(form.getJsrq()); + gspOld.setCctjbj(form.getCctj()); + gspOld.setZysxbj(form.getZysx()); + gspOld.setBjbz(form.getBjbz()); + gspOld.setBjzt(BjEnum.shz.getValue()); + gspOld.setBjrId(qmr.getUserId()); + gspOld.setBjrMc(qmr.getNickName()); + updateById(gspOld); + + + List gspJcgjList = new ArrayList<>(); + for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("申请编辑"); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gspJcgj.setJcnr(fieldChange.toString()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setRemark(form.getBjbz()); + gspJcgjList.add(gspJcgj); + } + gspJcgjService.saveBatch(gspJcgjList); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void shbj(GspShbjForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getBjzt().equals(BjEnum.shz.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】没有提交编辑申请，不能审核编辑"); + } + if (!(gspOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gspOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); + } + //region 稽查轨迹 + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText()); + if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + } else { + gspJcgj.setJcmcys(JcmcysEnum.red.getValue()); + } + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", gspOld.getBjbz()); + formData.put("审核备注", form.getRemark()); + gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgjService.save(gspJcgj); + //endregion + + //region 更新 + if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { + gspOld.setMc(gspOld.getMcbj()); + gspOld.setPh(gspOld.getPhbj()); + gspOld.setGg(gspOld.getGgbj()); + gspOld.setGgdw(gspOld.getGgdwbj()); + gspOld.setYxq(gspOld.getYxqbj()); + gspOld.setJsrq(gspOld.getJsrqbj()); + gspOld.setCctj(gspOld.getCctjbj()); + gspOld.setZysx(gspOld.getZysxbj()); + } + + //清空编辑信息 + gspOld.setMcbj(null); + gspOld.setPhbj(null); + gspOld.setGgbj(null); + gspOld.setGgdwbj(null); + gspOld.setYxqbj(null); + gspOld.setJsrqbj(null); + gspOld.setCctjbj(null); + gspOld.setZysxbj(null); + gspOld.setBjzt(BjEnum.wbj.getValue()); + this.updateById(gspOld); + //endregion + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void ysff(GspYsffForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); + //验证领取人1,领取人2,发放人密码 todo + Zcg zcg = zcgService.getById(form.getZcgId()); + if (zcg == null) { + throw new ServiceException("暂存柜不存在或已删除"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.isNull("zcg_id"); + List gspList = this.list(queryWrapper); + List gspJcgjList = new ArrayList<>(); + if (gspList.size() <= form.getIds().length) { + throw new ServiceException("药剂已被发放,请不要重复发放"); + } + String glyj = ""; + for (Gsp gsp : gspList) { + //更新暂存柜id + gsp.setZcgId(zcg.getId()); + //更新暂存柜关联药剂 + if (com.hxhq.common.core.utils.StringUtils.isBlank(glyj)) { + glyj += gsp.getMc(); + } else { + glyj += "," + gsp.getMc(); + } + + //region 稽查轨迹 + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gsp.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("钥匙发放"); + gspJcgj.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()); + + gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setQmrId(SecurityUtils.getUserId()); + gspJcgj.setQmrMc(SecurityUtils.getNickName()); + gspJcgjList.add(gspJcgj); + //endregion + } + if (com.hxhq.common.core.utils.StringUtils.isBlank(zcg.getGlyj())) { + zcg.setGlyj(glyj); + } else { + zcg.setGlyj(zcg.getGlyj() + "," + glyj); + } + zcg.setZt(zcgJyztEnum.jyz.getValue()); + zcgService.updateById(zcg); + this.saveOrUpdateBatch(gspList); + gspJcgjService.saveBatch(gspJcgjList); + + } + + @Override + public void ff(FfGspForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库状态，不能发放"); + } + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + //验证领取人1、领取人2、发放人1、发放人2密码 todo + Date now = new Date(); + gspFfjlService.ff(gspOld.getKc(), gspOld.getKcdw(), form.getZytj(),form.getRemark(),form.getMdIds(),gspOld,lqr1,lqr2,ffr1,ffr2,now); + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gspOld.getKc()+ gspOld.getKcdw()); + formData.put("转移条件", form.getZytj()); + formData.put("目的", form.getMdIds()); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), + SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //endregion + //region 台账 + String lqrMc = lqr1.getNickName(); + if(lqr2 != null) { + lqrMc = lqrMc + "," + lqr2.getNickName(); + } + String ffrMc = ffr1.getNickName(); + if(ffr2 != null) { + ffrMc = ffrMc + "," + ffr2.getNickName(); + } + gspTzService.saveTz(gspOld.getId(), lqrMc, "", + ffrMc, "", null, "", + "领取发放", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); + //endregion + //region 更新发放信息 + gspOld.setFfzytj(form.getZytj()); + gspOld.setLqr1Id(lqr1.getUserId()); + gspOld.setLqr1Mc(lqr1.getNickName()); + if(lqr2 != null) { + gspOld.setLqr2Id(lqr2.getUserId()); + gspOld.setLqr2Mc(lqr2.getNickName()); + } + gspOld.setFfr1Id(ffr1.getUserId()); + gspOld.setFfr1Mc(ffr1.getNickName()); + if(ffr2 != null) { + gspOld.setFfr2Id(ffr2.getUserId()); + gspOld.setFfr2Mc(ffr2.getNickName()); + } + gspOld.setFfrq(now); + gspOld.setFfbz(form.getRemark()); + gspOld.setMdIds(form.getMdIds()); + gspOld.setZjzt(ZjztEnum.yff.getValue()); + //endregion + this.updateById(gspOld); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void plff(GspPlffForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + //验证领取人1、领取人2、发放人1、发放人2密码 todo + + List gspIdList = form.getList().stream().map(GspPlffItem::getId).collect(Collectors.toList()); + + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", gspIdList); + queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + List gspList = this.list(queryWrapper); + List gspJcgjList = new ArrayList<>(); + List mjyTzList = new ArrayList<>(); + if (gspList.size() <= form.getList().size()) { + throw new ServiceException("存在供试品不是入库状态，不能发放"); + } + Date now = new Date(); + for (Gsp gsp : gspList) { + List plffItemFilter = form.getList().stream() + .filter(p -> p.getId().equals(gsp.getId())) + .collect(Collectors.toList()); + if (plffItemFilter.size() > 0) { + gspFfjlService.ff(gsp.getKc(),gsp.getKcdw(),plffItemFilter.get(0).getZytj(),plffItemFilter.get(0).getRemark(),plffItemFilter.get(0).getMdIds(),gsp,lqr1,lqr2,ffr1,ffr2,now); + //region 稽查轨迹 + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gsp.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("领取发放"); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gsp.getKc()+ gsp.getKcdw()); + formData.put("转移条件", plffItemFilter.get(0).getZytj()); + formData.put("目的", plffItemFilter.get(0).getMdIds()); + formData.put("备注", plffItemFilter.get(0).getRemark()); + gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setQmrId(SecurityUtils.getUserId()); + gspJcgj.setQmrMc(SecurityUtils.getNickName()); + gspJcgjList.add(gspJcgj); + //endregion + //region 台账 + GspTz gspTz = new GspTz(); + gspTz.setGspId(gsp.getId()); + gspTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName()); + gspTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName()); + gspTz.setQmyy("领取发放"); + gspTz.setCzl(gsp.getKc()); + gspTz.setCzldw(gsp.getKcdw()); + gspTz.setRemark(plffItemFilter.get(0).getRemark()); + mjyTzList.add(gspTz); + //endregion + //region 更新发放信息 + gsp.setFfzytj(plffItemFilter.get(0).getZytj()); + gsp.setLqr1Id(lqr1.getUserId()); + gsp.setLqr2Id(lqr2.getUserId()); + gsp.setFfr1Id(ffr1.getUserId()); + gsp.setFfr2Id(ffr2.getUserId()); + gsp.setLqr1Mc(lqr1.getNickName()); + gsp.setLqr2Mc(lqr2.getNickName()); + gsp.setFfr1Mc(ffr1.getNickName()); + gsp.setFfr2Mc(ffr2.getNickName()); + gsp.setFfr2Mc(ffr2.getNickName()); + gsp.setFfrq(now); + gsp.setFfbz(plffItemFilter.get(0).getRemark()); + gsp.setMdIds(plffItemFilter.get(0).getMdIds()); + gsp.setZjzt(ZjztEnum.yff.getValue()); + //endregion + } else { + throw new ServiceException("供试品【" + gsp.getMc() + "】不存在或已删除"); + } + } + gspJcgjService.saveBatch(gspJcgjList); + gspTzService.saveBatch(mjyTzList); + this.saveOrUpdateBatch(gspList); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void xgkc(GspXgkcForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getKcbjzt().equals(KcbjEnum.wbj.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】已经提交修改库存申请，请等待审核"); + } + if (!(gspOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gspOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库状态，不能修改库存"); + } + List fieldChanges = ObjectCompareUtil.compareObjects(gspOld, form); + if (fieldChanges.size() == 0) { + throw new ServiceException("你没有修改任何内容"); + } + List gspJcgjList = new ArrayList<>(); + //region 稽查轨迹 + for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("修改库存申请"); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gspJcgj.setJcnr(fieldChange.toString()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setRemark(form.getKcbjbz()); + gspJcgjList.add(gspJcgj); + } + //endregion + + gspOld.setKcdwbj(form.getKcdw()); + gspOld.setKcbj(form.getKc()); + gspOld.setKcbjrMc(qmr.getNickName()); + gspOld.setKcbjbz(form.getKcbjbz()); + gspOld.setKcbjzt(KcbjEnum.shz.getValue()); + gspOld.setKcbjrId(qmr.getUserId()); + gspOld.setKcbjrMc(qmr.getNickName()); + this.updateById(gspOld); + gspJcgjService.saveBatch(gspJcgjList); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void shxgkc(GspShxgkcForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getKcbjzt().equals(KcbjEnum.shz.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】没有提交修改库存申请，不能审核修改库存"); + } + if (!(gspOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gspOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); + } + //region 稽查轨迹 + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + } else { + gspJcgj.setJcmcys(JcmcysEnum.red.getValue()); + } + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", gspOld.getKcbjbz()); + formData.put("审核备注", form.getRemark()); + gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgjService.save(gspJcgj); + //endregion + + //region 更新 + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gspOld.setKcdw(gspOld.getKcdwbj()); + gspOld.setKc(gspOld.getKcbj()); + } + gspOld.setKcbj(null); + gspOld.setKcdwbj(null); + gspOld.setKcbjbz(null); + gspOld.setKcbjzt(KcbjEnum.wbj.getValue()); + this.updateById(gspOld); + //endregion + + //region 台账 + if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gspTzService.saveTz(gspOld.getId(), "", "", + "", "", qmr.getUserId(), qmr.getNickName(), + "修改库存", form.getKc(), form.getKcdw(), gspOld.getKcbjbz()); + } + //endregion + } + + @Override + public void plsd(GspSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds() == null || form.getIds().length < 0) { + throw new ServiceException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List gspList = this.list(queryWrapper); + List gspJcgjList = new ArrayList<>(); + for (Gsp gsp : gspList) { + if (!gsp.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new ServiceException("供试品【" + gsp.getMc() + "】不是入库状态，不能锁定"); + } + //锁定 + gsp.setZjzt(ZjztEnum.ysd.getValue()); + + //region 稽查轨迹 + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gsp.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("锁定供试品"); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setQmrId(SecurityUtils.getUserId()); + gspJcgj.setQmrMc(SecurityUtils.getNickName()); + gspJcgjList.add(gspJcgj); + //endregion + + } + this.saveOrUpdateBatch(gspList); + gspJcgjService.saveBatch(gspJcgjList); + } + + @Override + public void sd(GspSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库状态，不能锁定"); + } + gspOld.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(gspOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + } + + @Override + public void js(GspJsForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是已锁定状态，不能解锁"); + } + //点击解锁，状态更新为入库； + gspOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(gspOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void cz(GspCzForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gspOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("供试品【" + gspOld.getMc() + "】不是入库状态，不能处置"); + } + if(!NumberUtils.isParsable(form.getCzl())) { + throw new ServiceException("请输入正确的处置量"); + } + BigDecimal czl = new BigDecimal(form.getCzl()); + BigDecimal kc = new BigDecimal(gspOld.getKc()); + if(czl.compareTo(kc) > 0) { + throw new ServiceException("处置量不应大于库存量"); + } + kc = kc.subtract(czl); + gspOld.setKc(kc.toString()); + updateById(gspOld); + + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("处置方式", form.getCzfs()); + jcnrMap.put("处置量", form.getCzl()); + jcnrMap.put("原因", form.getRemark()); + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gspOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); + gspJcgj.setJcmc("处置"); + gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap)); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgjService.save(gspJcgj); + + // 台账 + gspTzService.saveTz(gspOld.getId(), null, null, null, null, qmr.getUserId(), qmr.getNickName(), + "处置", form.getCzl(), gspOld.getKcdw(), form.getRemark()); + + } + + @Override + public void plcz(GspPlczForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + + List gspList = new ArrayList<>(); + Map map = new HashMap<>(); + for (GspPlczItemForm itemForm : form.getList()) { + if (itemForm.getId() == null || itemForm.getId() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(itemForm.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是入库状态，不能处置"); + } + if(!NumberUtils.isParsable(itemForm.getCzl())) { + throw new ServiceException("请输入正确的处置量"); + } + BigDecimal czl = new BigDecimal(itemForm.getCzl()); + BigDecimal kc = new BigDecimal(gsp.getKc()); + if(czl.compareTo(kc) > 0) { + throw new ServiceException("处置量不应大于库存量"); + } + kc = kc.subtract(czl); + gsp.setKc(kc.toString()); + gspList.add(gsp); + + map.put(gsp.getId(), gsp); + } + updateBatchById(gspList); + + List gspJcgjList = new ArrayList<>(); + List gspTzs = new ArrayList<>(); + for (GspPlczItemForm itemForm : form.getList()) { + Gsp gsp = map.get(itemForm.getId()); + + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("处置方式", itemForm.getCzfs()); + jcnrMap.put("处置量", itemForm.getCzl()); + jcnrMap.put("原因", itemForm.getRemark()); + GspJcgj gspJcgj = new GspJcgj(); + gspJcgj.setGspId(gsp.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); + gspJcgj.setJcmc("处置"); + gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap)); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgjList.add(gspJcgj); + + // 台账 + GspTz gspTz = new GspTz(); + gspTz.setGspId(gsp.getId()); + gspTz.setQmrId(qmr.getUserId()); + gspTz.setQmrMc(qmr.getNickName()); + gspTz.setQmyy("处置"); + gspTz.setCzl(itemForm.getCzl()); + gspTz.setCzldw(gsp.getKcdw()); + gspTz.setRemark(itemForm.getRemark()); + gspTzs.add(gspTz); + } + gspJcgjService.saveBatch(gspJcgjList); + gspTzService.saveBatch(gspTzs); + } + + @Override + public void jy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是归档状态，不能借阅"); + } + if (!gsp.getJyzt().equals(JyztEnum.wjy.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是未借阅状态，不能借阅"); + } + //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； + gsp.setJyzt(JyztEnum.djy.getValue()); + gsp.setJyksrq(form.getStartDate()); + gsp.setJyjsrq(form.getEndDate()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); + formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + } + + @Override + public void jd(GspJdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】未归档，不能解档"); + } + //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； + gsp.setZjzt(ZjztEnum.djd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + } + + @Override + public void gd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gsp.setZjzt(ZjztEnum.dgd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + } + + @Override + public void plgd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + + List gspList = new ArrayList<>(); + for (Long id : form.getIds()) { + if (id == null || id < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + gsp.setZjzt(ZjztEnum.dgd.getValue()); + gspList.add(gsp); + } + this.updateBatchById(gspList); + + //稽查轨迹 + for (Gsp gsp : gspList) { + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void gh(GspGhForm form) { + SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); + SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); + SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); + SysUser qmr = sysUserService.selectUserById(form.getJsr1Id()); + //验证密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Gsp gspOld = this.getById(form.getId()); + if (gspOld == null) { + throw new ServiceException("供试品不存在或已删除"); + } + if (!gspOld.getZjzt().equals(ZjztEnum.yff.getValue())) { + throw new ServiceException("供试品【" + gspOld.getMc() + "】不是已发放状态，不能归还"); + } + gspOld.setKc(form.getRkl()); + gspOld.setKcdw(form.getRkldw()); + gspOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(gspOld); + + gspFfjlService.gh(form,gspOld,ghr1,ghr2,jsr1,jsr2); + //region 台账 + String ghrMc = ghr1.getNickName(); + if(ghr2 != null) { + ghrMc = ghrMc + "," + ghr2.getNickName(); + } + String jsrMc = jsr1.getNickName(); + if(jsr2 != null) { + jsrMc = jsrMc + "," + jsr2.getNickName(); + } + gspTzService.saveTz(gspOld.getId(), "", ghrMc, + "", jsrMc, null, null, + "归还", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); + //endregion + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("归还转移条件", form.getGhzytj()); + formData.put("入库量", form.getRkl()+form.getRkldw()); + formData.put("归还人1", ghr1.getNickName()); + if(ghr2 != null) { + formData.put("归还人2", ghr2.getNickName()); + } + formData.put("库管员1", jsr1.getNickName()); + if(jsr2 != null) { + formData.put("库管员2", jsr2.getNickName()); + } + formData.put("备注", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //endregion + + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java new file mode 100644 index 0000000..4585836 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java @@ -0,0 +1,58 @@ +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.MjyTz; +import com.hxhq.business.domain.SjTz; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.GspTzMapper; +import com.hxhq.business.domain.GspTz; +import com.hxhq.business.service.IGspTzService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 供试品-台账Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class GspTzServiceImpl extends ServiceImpl implements IGspTzService +{ + /** + * 查询供试品-台账列表 + * + * @param form 供试品-台账 + * @return 供试品-台账 + */ + @Override + public List queryList(GspTz form) + { + QueryWrapper queryWrapper = Wrappers.query(); + if(form.getGspId()==null||form.getGspId().longValue()<0){ + throw new SecurityException("供试品id不能为空"); + } + queryWrapper.eq("gsp_id",form.getGspId()); + queryWrapper.orderByDesc("id"); + return this.list(queryWrapper); + } + + @Override + public void saveTz(Long gspId, String lqrMc, String ghrMc, String ffrMc, String jsrMc, Long qmrId, String qmrMc, String qmyy, String czl, String czldw, String remark) { + GspTz gspTz = new GspTz(); + gspTz.setGspId(gspId); + gspTz.setLqrMc(lqrMc); + gspTz.setGhrMc(ghrMc); + gspTz.setFfrMc(ffrMc); + gspTz.setJsrMc(jsrMc); + gspTz.setQmrId(qmrId); + gspTz.setQmrMc(qmrMc); + gspTz.setQmyy(qmyy); + gspTz.setCzldw(czldw); + gspTz.setCzl(czl); + gspTz.setRemark(remark); + this.save(gspTz); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 461055d..7a199bd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -23,6 +23,7 @@ import com.hxhq.common.core.utils.DateUtils; import com.hxhq.system.api.domain.SysUser; import com.hxhq.system.service.ISysUserService; import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.SjMapper; @@ -43,7 +44,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi private ISysUserService sysUserService; @Autowired - private ISjJcgjService sjkcJcgjService; + private ISjJcgjService sjJcgjService; @Autowired private ISjTzService sjTzService; @@ -95,13 +96,14 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi mjyJcgj.setQmyy("修改库存"); mjyJcgj.setQmrId(qmr.getUserId()); mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setRemark(form.getKcbjbz()); sjJcgjList.add(mjyJcgj); } - sjkcJcgjService.saveBatch(sjJcgjList); + sjJcgjService.saveBatch(sjJcgjList); //endregion // 台账 - sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), "修改库存", form.getKc(), form.getKcdw(), null); + sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), "修改库存", form.getKc(), form.getKcdw(), form.getKcbjbz()); } @Override @@ -144,7 +146,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi sjJcgj.setQmyy("处置"); sjJcgj.setQmrId(qmr.getUserId()); sjJcgj.setQmrMc(qmr.getNickName()); - sjkcJcgjService.save(sjJcgj); + sjJcgjService.save(sjJcgj); // 台账 sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), "处置", form.getCzl(), sjOld.getKcdw(), form.getRemark()); @@ -208,6 +210,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi // 台账 SjTz sjTz = new SjTz(); + sjTz.setSjId(sj.getId()); sjTz.setQmrId(qmr.getUserId()); sjTz.setQmrMc(qmr.getNickName()); sjTz.setQmyy("处置"); @@ -216,7 +219,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi sjTz.setRemark(itemForm.getRemark()); sjTzList.add(sjTz); } - sjkcJcgjService.saveBatch(sjJcgjList); + sjJcgjService.saveBatch(sjJcgjList); sjTzService.saveBatch(sjTzList); } @@ -241,9 +244,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定试剂"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "锁定试剂"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } @Override @@ -272,9 +275,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi for (Sj sj : sjList) { Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定试剂"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "锁定试剂"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } } @@ -299,9 +302,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "解锁试剂"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "解锁试剂"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } @Override @@ -331,9 +334,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请借阅"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "申请借阅"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData)); } @Override @@ -356,9 +359,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请解档"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "申请解档"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } @Override @@ -381,13 +384,13 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "申请归档"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } @Override - public void plgd(GdForm form) { + public void plgd(GdSjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo @@ -413,11 +416,47 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi for (Sj sj : sjList) { Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); - sjkcJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); + // formData.put("签名意义", "申请归档"); + // formData.put("签名人", qmr.getNickName()); + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData)); } } + @Override + public void bj(SjBjForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + + Sj sjOld = this.getById(form.getId()); + if (sjOld == null) { + throw new SecurityException("试剂不存在或已删除"); + } + if (!sjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("试剂【" + sjOld.getMc() + "】不是入库状态，不能编辑"); + } + List fieldChanges = ObjectCompareUtil.compareObjects(sjOld, form); + if (fieldChanges.size() == 0) { + throw new ServiceException("你没有修改任何内容"); + } + + BeanUtils.copyProperties(form, sjOld); + updateById(sjOld); + + List gspJcgjList = new ArrayList<>(); + for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { + SjJcgj gspJcgj = new SjJcgj(); + gspJcgj.setSjId(sjOld.getId()); + gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + gspJcgj.setJcmc("编辑"); + gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); + gspJcgj.setJcnr(fieldChange.toString()); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setRemark(form.getQmbz()); + gspJcgjList.add(gspJcgj); + } + sjJcgjService.saveBatch(gspJcgjList); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java index 5d10b38..62fda39 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java @@ -1,5 +1,6 @@ package com.hxhq.system.service.impl; +import java.util.ArrayList; import java.util.List; import com.hxhq.system.mapper.SysDictDataMapper; @@ -29,7 +30,18 @@ public class SysDictDataServiceImpl implements ISysDictDataService @Override public List selectDictDataList(SysDictData dictData) { - return dictDataMapper.selectDictDataList(dictData); + if(dictData.getDictType().contains(",")) { + List sysDictDataList = new ArrayList<>(); + String[] dictTypeList = dictData.getDictType().split(","); + for (String dictType : dictTypeList) { + dictData.setDictType(dictType); + List sysDictData = dictDataMapper.selectDictDataList(dictData); + sysDictDataList.addAll(sysDictData); + } + return sysDictDataList; + } else { + return dictDataMapper.selectDictDataList(dictData); + } } /** diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlJcgjMapper.xml new file mode 100644 index 0000000..a9d3374 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlMapper.xml new file mode 100644 index 0000000..0ce23ae --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspJcgjMapper.xml new file mode 100644 index 0000000..5b08663 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml new file mode 100644 index 0000000..07076b4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlJcgjMapper.xml new file mode 100644 index 0000000..ed0c22c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlMapper.xml new file mode 100644 index 0000000..b260bab --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspTzMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspTzMapper.xml new file mode 100644 index 0000000..5a2e8a6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspTzMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file