From aac6e7eef4ded9ced7156aee09f41b6ce0047721 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sun, 21 Dec 2025 18:28:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/GyzjFfjlController.java | 66 --- .../business/controller/GyzjJcgjController.java | 66 --- .../hxhq/business/controller/GyzjTzController.java | 66 --- .../hxhq/business/controller/MjyController.java | 163 ++++++- .../business/controller/MjyFfjlController.java | 66 --- .../business/controller/MjyJcgjController.java | 66 --- .../hxhq/business/controller/MjyTzController.java | 66 --- .../hxhq/business/controller/ZcgController.java | 13 +- .../java/com/hxhq/business/domain/GyzjFfjl.java | 487 +++++++++++++++---- .../java/com/hxhq/business/domain/GyzjJcgj.java | 32 +- .../main/java/com/hxhq/business/domain/Mjy.java | 133 ++++- .../java/com/hxhq/business/domain/MjyFfjl.java | 477 ++++++++++++++---- .../java/com/hxhq/business/domain/MjyJcgj.java | 32 +- .../com/hxhq/business/enums/zykgl/JcgjlxEnum.java | 51 ++ .../java/com/hxhq/business/form/mjy/MjyBjForm.java | 122 +++++ .../com/hxhq/business/form/mjy/MjyCzrqForm.java | 106 ++++ .../com/hxhq/business/form/mjy/MjyCzyjForm.java | 106 ++++ .../java/com/hxhq/business/form/mjy/MjyFfForm.java | 161 +++++++ .../java/com/hxhq/business/form/mjy/MjyGdForm.java | 62 +++ .../java/com/hxhq/business/form/mjy/MjyJdForm.java | 51 ++ .../java/com/hxhq/business/form/mjy/MjyJsForm.java | 51 ++ .../com/hxhq/business/form/mjy/MjyPlffForm.java | 119 +++++ .../hxhq/business/form/mjy/MjyPlffItemForm.java | 75 +++ .../java/com/hxhq/business/form/mjy/MjySdForm.java | 62 +++ .../com/hxhq/business/form/mjy/MjyShbjForm.java | 122 +++++ .../com/hxhq/business/form/mjy/MjyShxgkcForm.java | 95 ++++ .../com/hxhq/business/form/mjy/MjyXgkcForm.java | 73 +++ .../com/hxhq/business/form/mjy/MjyYsffForm.java | 117 +++++ .../java/com/hxhq/business/form/zcg/YsffForm.java | 120 ----- .../java/com/hxhq/business/form/zcg/YsghForm.java | 107 ---- .../com/hxhq/business/form/zcg/ZcgYsffForm.java | 120 +++++ .../com/hxhq/business/form/zcg/ZcgYsghForm.java | 107 ++++ .../com/hxhq/business/mapper/GyzjFfjlMapper.java | 2 +- .../com/hxhq/business/mapper/MjyFfjlMapper.java | 2 +- .../hxhq/business/service/IGyzjFfjlService.java | 2 +- .../hxhq/business/service/IGyzjJcgjService.java | 22 +- .../com/hxhq/business/service/IMjyFfjlService.java | 2 +- .../com/hxhq/business/service/IMjyJcgjService.java | 24 +- .../com/hxhq/business/service/IMjyService.java | 101 +++- .../com/hxhq/business/service/IZcgService.java | 11 +- .../business/service/impl/GyzjFfjlServiceImpl.java | 2 +- .../business/service/impl/GyzjJcgjServiceImpl.java | 42 +- .../business/service/impl/MjyFfjlServiceImpl.java | 2 +- .../business/service/impl/MjyJcgjServiceImpl.java | 45 +- .../hxhq/business/service/impl/MjyServiceImpl.java | 536 ++++++++++++++++++++- .../hxhq/business/service/impl/ZcgServiceImpl.java | 14 +- 46 files changed, 3466 insertions(+), 901 deletions(-) delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjJcgjController.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjTzController.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyJcgjController.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyTzController.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItemForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsffForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsghForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsffForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsghForm.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java deleted file mode 100644 index 79fd678..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.GyzjFfjl; -import com.hxhq.business.service.IGyzjFfjlService; -import com.hxhq.common.core.web.controller.BaseController; -import com.hxhq.common.core.web.domain.AjaxResult; -import com.hxhq.common.core.web.page.TableDataInfo; - - -/** - * 给药制剂-发放记录Controller - * - * @author hxhq - * @date 2025-12-18 - */ -@RestController -@RequestMapping("/business/gyzjFfjl") -public class GyzjFfjlController extends BaseController -{ - @Autowired - private IGyzjFfjlService gyzjFfjlService; - - /** - * 查询给药制剂-发放记录列表 - */ - @GetMapping("/list") - public TableDataInfo list(GyzjFfjl gyzjFfjl) - { - startPage(); - List list = gyzjFfjlService.queryList(gyzjFfjl); - return getDataTable(list); - } - - /** - * 获取给药制剂-发放记录详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(gyzjFfjlService.getById(id)); - } - - /** - * 新增给药制剂-发放记录信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody GyzjFfjl gyzjFfjl) - { - return toAjax(gyzjFfjlService.saveOrUpdate(gyzjFfjl)); - } - - /** - * 删除给药制剂-发放记录信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(gyzjFfjlService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjJcgjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjJcgjController.java deleted file mode 100644 index 6e5d93d..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjJcgjController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.GyzjJcgj; -import com.hxhq.business.service.IGyzjJcgjService; -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-18 - */ -@RestController -@RequestMapping("/business/gyzjJcgj") -public class GyzjJcgjController extends BaseController -{ - @Autowired - private IGyzjJcgjService gyzjJcgjService; - - /** - * 查询给药制剂-稽查轨迹列表 - */ - @GetMapping("/list") - public TableDataInfo list(GyzjJcgj gyzjJcgj) - { - startPage(); - List list = gyzjJcgjService.queryList(gyzjJcgj); - return getDataTable(list); - } - - /** - * 获取给药制剂-稽查轨迹详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(gyzjJcgjService.getById(id)); - } - - /** - * 新增给药制剂-稽查轨迹信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody GyzjJcgj gyzjJcgj) - { - return toAjax(gyzjJcgjService.saveOrUpdate(gyzjJcgj)); - } - - /** - * 删除给药制剂-稽查轨迹信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(gyzjJcgjService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjTzController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjTzController.java deleted file mode 100644 index 77ab48a..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjTzController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.GyzjTz; -import com.hxhq.business.service.IGyzjTzService; -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-18 - */ -@RestController -@RequestMapping("/business/gyzjTz") -public class GyzjTzController extends BaseController -{ - @Autowired - private IGyzjTzService gyzjTzService; - - /** - * 查询给药制剂-台账列表 - */ - @GetMapping("/list") - public TableDataInfo list(GyzjTz gyzjTz) - { - startPage(); - List list = gyzjTzService.queryList(gyzjTz); - return getDataTable(list); - } - - /** - * 获取给药制剂-台账详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(gyzjTzService.getById(id)); - } - - /** - * 新增给药制剂-台账信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody GyzjTz gyzjTz) - { - return toAjax(gyzjTzService.saveOrUpdate(gyzjTz)); - } - - /** - * 删除给药制剂-台账信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(gyzjTzService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java index 30d1b84..7a934bb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java @@ -1,17 +1,13 @@ package com.hxhq.business.controller; -import java.util.Arrays; import java.util.List; -import com.hxhq.business.domain.Zcg; import com.hxhq.business.dto.mjy.MjyDto; -import com.hxhq.business.form.mjy.MjySearchForm; -import com.hxhq.business.form.zcg.ZcgSearchForm; +import com.hxhq.business.form.mjy.*; import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.Mjy; import com.hxhq.business.service.IMjyService; import com.hxhq.common.core.web.controller.BaseController; import com.hxhq.common.core.web.domain.AjaxResult; @@ -53,4 +49,159 @@ public class MjyController extends BaseController return AjaxResult.success(mjyService.queryInfo(id)); } + /** + * 解档 + */ + @PostMapping("/jd") + @RequiresPermissions("business:resource:mjy:jd") + public AjaxResult jd(@RequestBody MjyJdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + @RequiresPermissions("business:resource:mjy:gd") + public AjaxResult plgd(@RequestBody MjyGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + @RequiresPermissions("business:resource:mjy:gd") + public AjaxResult gd(@RequestBody MjyGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.gd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + @RequiresPermissions("business:resource:mjy:sd") + public AjaxResult plsd(@RequestBody MjySdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + @RequiresPermissions("business:resource:mjy:sd") + public AjaxResult sd(@RequestBody MjySdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.sd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 解锁 + */ + @PostMapping("/js") + @RequiresPermissions("business:resource:mjy:js") + public AjaxResult js(@RequestBody MjyJsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.js(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量处置药剂 + */ + @PostMapping("/plczyj") + @RequiresPermissions("business:resource:mjy:czyj") + public AjaxResult plczyj(@RequestBody MjyCzyjForm form) + { + mjyService.plczyj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 处置药剂 + */ + @PostMapping("/czyj") + @RequiresPermissions("business:resource:mjy:czyj") + public AjaxResult czyj(@RequestBody MjyCzyjForm form) + { + mjyService.czyj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量处置容器 + */ + @PostMapping("/plczrq") + @RequiresPermissions("business:resource:mjy:czrq") + public AjaxResult plczrq(@RequestBody MjyCzrqForm form) + { + mjyService.plczrq(form); + return AjaxResult.success("操作成功"); + } + + /** + * 处置容器 + */ + @PostMapping("/czrq") + @RequiresPermissions("business:resource:mjy:czrq") + public AjaxResult czrq(@RequestBody MjyCzrqForm form) + { + mjyService.czrq(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 钥匙发放 + */ + @PostMapping("ysff") + @RequiresPermissions("business:resource:mjy:ysff") + public AjaxResult ysff(@RequestBody MjyYsffForm form) + { + form.setFfrId(SecurityUtils.getUserId()); + mjyService.ysff(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 发放 + */ + @PostMapping("ff") + @RequiresPermissions("business:resource:mjy:ff") + public AjaxResult ff(@RequestBody MjyFfForm form) + { + mjyService.ff(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量发放 + */ + @PostMapping("plff") + @RequiresPermissions("business:resource:mjy:ff") + public AjaxResult plff(@RequestBody MjyPlffForm form) + { + mjyService.plff(form); + return AjaxResult.success("操作成功"); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java deleted file mode 100644 index 3896003..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.MjyFfjl; -import com.hxhq.business.service.IMjyFfjlService; -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-18 - */ -@RestController -@RequestMapping("/business/mjyFfjl") -public class MjyFfjlController extends BaseController -{ - @Autowired - private IMjyFfjlService mjyFfjlService; - - /** - * 查询麻精药-发放记录列表 - */ - @GetMapping("/list") - public TableDataInfo list(MjyFfjl mjyFfjl) - { - startPage(); - List list = mjyFfjlService.queryList(mjyFfjl); - return getDataTable(list); - } - - /** - * 获取麻精药-发放记录详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(mjyFfjlService.getById(id)); - } - - /** - * 新增麻精药-发放记录信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody MjyFfjl mjyFfjl) - { - return toAjax(mjyFfjlService.saveOrUpdate(mjyFfjl)); - } - - /** - * 删除麻精药-发放记录信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(mjyFfjlService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyJcgjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyJcgjController.java deleted file mode 100644 index 6bafd03..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyJcgjController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.MjyJcgj; -import com.hxhq.business.service.IMjyJcgjService; -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-18 - */ -@RestController -@RequestMapping("/business/mjyJcgj") -public class MjyJcgjController extends BaseController -{ - @Autowired - private IMjyJcgjService mjyJcgjService; - - /** - * 查询麻精药-稽查轨迹列表 - */ - @GetMapping("/list") - public TableDataInfo list(MjyJcgj mjyJcgj) - { - startPage(); - List list = mjyJcgjService.queryList(mjyJcgj); - return getDataTable(list); - } - - /** - * 获取麻精药-稽查轨迹详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(mjyJcgjService.getById(id)); - } - - /** - * 新增麻精药-稽查轨迹信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody MjyJcgj mjyJcgj) - { - return toAjax(mjyJcgjService.saveOrUpdate(mjyJcgj)); - } - - /** - * 删除麻精药-稽查轨迹信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(mjyJcgjService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyTzController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyTzController.java deleted file mode 100644 index 2589d4d..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyTzController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hxhq.business.controller; - -import java.util.Arrays; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.MjyTz; -import com.hxhq.business.service.IMjyTzService; -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-18 - */ -@RestController -@RequestMapping("/business/mjyTz") -public class MjyTzController extends BaseController -{ - @Autowired - private IMjyTzService mjyTzService; - - /** - * 查询麻精药-台账列表 - */ - @GetMapping("/list") - public TableDataInfo list(MjyTz mjyTz) - { - startPage(); - List list = mjyTzService.queryList(mjyTz); - return getDataTable(list); - } - - /** - * 获取麻精药-台账详细信息 - */ - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) - { - return AjaxResult.success(mjyTzService.getById(id)); - } - - /** - * 新增麻精药-台账信息 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody MjyTz mjyTz) - { - return toAjax(mjyTzService.saveOrUpdate(mjyTz)); - } - - /** - * 删除麻精药-台账信息 - */ - @PostMapping("/delete") - public AjaxResult delete(@RequestBody Long[] ids) - { - return toAjax(mjyTzService.removeByIds(Arrays.asList(ids))); - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/ZcgController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/ZcgController.java index b213633..c052c0f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/ZcgController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/ZcgController.java @@ -1,18 +1,15 @@ package com.hxhq.business.controller; -import java.util.Arrays; import java.util.List; import com.hxhq.business.dto.zcg.ZcgDto; -import com.hxhq.business.form.zcg.YsffForm; -import com.hxhq.business.form.zcg.YsghForm; +import com.hxhq.business.form.zcg.ZcgYsffForm; +import com.hxhq.business.form.zcg.ZcgYsghForm; import com.hxhq.business.form.zcg.ZcgSearchForm; import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import com.hxhq.business.domain.Zcg; import com.hxhq.business.service.IZcgService; import com.hxhq.common.core.web.controller.BaseController; import com.hxhq.common.core.web.domain.AjaxResult; @@ -59,7 +56,7 @@ public class ZcgController extends BaseController */ @PostMapping("/ysgh") @RequiresPermissions("business:resource:zcg:ysgh") - public AjaxResult ysgh(@RequestBody YsghForm form) + public AjaxResult ysgh(@RequestBody ZcgYsghForm form) { form.setJsrId(SecurityUtils.getUserId()); zcgService.ysgh(form); @@ -72,7 +69,7 @@ public class ZcgController extends BaseController */ @PostMapping("/ysghBatch") @RequiresPermissions("business:resource:zcg:ysgh") - public AjaxResult ysghBatch(@RequestBody YsghForm form) + public AjaxResult ysghBatch(@RequestBody ZcgYsghForm form) { form.setJsrId(SecurityUtils.getUserId()); zcgService.ysghBatch(form); @@ -84,7 +81,7 @@ public class ZcgController extends BaseController */ @PostMapping("/ysff") @RequiresPermissions("business:resource:zcg:ysff") - public AjaxResult ysff(@RequestBody YsffForm form) + public AjaxResult ysff(@RequestBody ZcgYsffForm form) { form.setFfrId(SecurityUtils.getUserId()); zcgService.ysff(form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index 30f3f85..b12494e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -10,199 +10,510 @@ import com.hxhq.common.core.domain.MpBaseEntity; * 给药制剂-发放记录对象 t_gyzj_ffjl * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ @TableName("t_gyzj_ffjl") public class GyzjFfjl extends MpBaseEntity { private static final long serialVersionUID = 1L; - /** 给药制剂id */ - private Long gyzjId; + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Long jlzt; - /** 目的 */ - private String md; + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Long jyzt; - /** 转移条件 */ - private String zytj; + /** 麻精药id */ + private Long mjyId; - /** 出库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date cksj; + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 浓度 */ + private String nd; + + /** 浓度单位 */ + private String nddw; - /** 出库净重 */ - private String ckjz; + /** 存储条件 */ + private String cctj; - /** 入库时间 */ + /** 存储位置 */ + private String ccwz; + + /** 失效日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date rksj; + private Date sxrq; + + /** 保存条件 */ + private String bctj; + + /** 出库量 */ + private String ckl; - /** 入库净重 */ - private String rkjz; + /** 出库量单位 */ + private String ckldw; - /** 使用量 */ - private String syl; + /** 发放转移条件 */ + private String ffzytj; - /** 领取人1 id */ + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1id */ private Long lqr1Id; - /** 领取人2 id */ + /** 领取人2id */ private Long lqr2Id; - /** 库管员1 id*/ - private Long kgy1Id; + /** 发放人1id */ + private Long ffr1Id; - /** 库管员2 id*/ - private Long kgy2Id; + /** 发放人2id */ + private Long ffr2Id; - /** 暂存柜id */ - private Long zckId; + /** 领取人1名称 */ + private String lqr1Mc; - /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ - private Integer jlzt; + /** 领取人2名称 */ + private String lqr2Mc; - /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ - private Integer jyzt; + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 领取日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lqrq; + + /** 发放备注 */ + private String ffbz; + + /** 归还转移条件 */ + private String ghzytj; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 归还人1id */ + private Long ghr1Id; + + /** 归还人2id */ + private Long ghr2Id; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人2id */ + private Long jsr2Id; + + /** 归还人1名称 */ + private String ghr1Mc; + + /** 归还人2名称 */ + private String ghr2Mc; + + /** 接收人1名称 */ + private String jsr1Mc; + + /** 接收人2名称 */ + private String jsr2Mc; + + /** 接收日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date jsrq; + + /** 归还备注 */ + private String ghbz; + + /** 归档申请人id */ + private Long 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 String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + public String 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 String getJsr1Mc() { + return jsr1Mc; + } - public void setGyzjId(Long gyzjId) + public void setJsr1Mc(String jsr1Mc) { + this.jsr1Mc = jsr1Mc; + } + + public String getJsr2Mc() { + return jsr2Mc; + } + + public void setJsr2Mc(String jsr2Mc) { + this.jsr2Mc = jsr2Mc; + } + + 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 Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public void setJlzt(Long jlzt) { - this.gyzjId = gyzjId; + this.jlzt = jlzt; } - public Long getGyzjId() + public Long getJlzt() { - return gyzjId; + return jlzt; } - public void setMd(String md) + public void setJyzt(Long jyzt) { - this.md = md; + this.jyzt = jyzt; } - public String getMd() + public Long getJyzt() { - return md; + return jyzt; } - public void setZytj(String zytj) + public void setMjyId(Long mjyId) { - this.zytj = zytj; + this.mjyId = mjyId; } - public String getZytj() + public Long getMjyId() { - return zytj; + return mjyId; } - public void setCksj(Date cksj) + public void setMc(String mc) { - this.cksj = cksj; + this.mc = mc; } - public Date getCksj() + public String getMc() { - return cksj; + return mc; } - public void setCkjz(String ckjz) + public void setBh(String bh) { - this.ckjz = ckjz; + this.bh = bh; } - public String getCkjz() + public String getBh() { - return ckjz; + return bh; } - public void setRksj(Date rksj) + public void setNd(String nd) { - this.rksj = rksj; + this.nd = nd; } - public Date getRksj() + public String getNd() { - return rksj; + return nd; } - public void setRkjz(String rkjz) + public void setNddw(String nddw) { - this.rkjz = rkjz; + this.nddw = nddw; } - public String getRkjz() + public String getNddw() { - return rkjz; + return nddw; } - public void setSyl(String syl) + public void setCctj(String cctj) { - this.syl = syl; + this.cctj = cctj; } - public String getSyl() + public String getCctj() { - return syl; + return cctj; } - public Long getLqr1Id() { - return lqr1Id; + public void setCcwz(String ccwz) + { + this.ccwz = ccwz; + } + + public String getCcwz() + { + return ccwz; + } + + public Date getSxrq() { + return sxrq; } - public void setLqr1Id(Long lqr1Id) { + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } + + public void setBctj(String bctj) + { + this.bctj = bctj; + } + + public String getBctj() + { + return bctj; + } + + 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 setFfzytj(String ffzytj) + { + this.ffzytj = ffzytj; + } + + public String getFfzytj() + { + return ffzytj; + } + + public void setCkmz(String ckmz) + { + this.ckmz = ckmz; + } + + public String getCkmz() + { + return ckmz; + } + + public void setCkmzdw(String ckmzdw) + { + this.ckmzdw = ckmzdw; + } + + public String getCkmzdw() + { + return ckmzdw; + } + + public void setLqr1Id(Long lqr1Id) + { this.lqr1Id = lqr1Id; } - public Long getLqr2Id() { - return lqr2Id; + public Long getLqr1Id() + { + return lqr1Id; } - public void setLqr2Id(Long lqr2Id) { + public void setLqr2Id(Long lqr2Id) + { this.lqr2Id = lqr2Id; } - public Long getKgy1Id() { - return kgy1Id; + public Long getLqr2Id() + { + return lqr2Id; } - public void setKgy1Id(Long kgy1Id) { - this.kgy1Id = kgy1Id; + + public void setLqrq(Date lqrq) + { + this.lqrq = lqrq; } - public Long getKgy2Id() { - return kgy2Id; + public Date getLqrq() + { + return lqrq; } - public void setKgy2Id(Long kgy2Id) { - this.kgy2Id = kgy2Id; + public void setFfbz(String ffbz) + { + this.ffbz = ffbz; } - public void setZckId(Long zckId) + public String getFfbz() { - this.zckId = zckId; + return ffbz; } - public Long getZckId() + public void setGhzytj(String ghzytj) { - return zckId; + this.ghzytj = ghzytj; } - public Integer getJlzt() { - return jlzt; + public String getGhzytj() + { + return ghzytj; } - public void setJlzt(Integer jlzt) { - this.jlzt = jlzt; + public void setRkl(String rkl) + { + this.rkl = rkl; } - public void setJyzt(Integer jyzt) + public String getRkl() { - this.jyzt = jyzt; + return rkl; } - public Integer getJyzt() + public void setRkldw(String rkldw) { - return jyzt; + this.rkldw = rkldw; + } + + public String getRkldw() + { + return rkldw; + } + + 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 setJsrq(Date jsrq) + { + this.jsrq = jsrq; + } + + public Date getJsrq() + { + return jsrq; + } + + 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; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java index c2e0ae2..348c39e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java @@ -19,8 +19,8 @@ public class GyzjJcgj extends MpBaseEntity /** 给药制剂id */ private Long gyzjId; - /** 稽查轨迹类型 */ - private String jcgjlx; + /** 稽查轨迹类型:1:流程；3：编辑 */ + private Integer jcgjlx; /** 稽查名称 */ private String jcmc; @@ -31,11 +31,11 @@ public class GyzjJcgj extends MpBaseEntity /** 稽查内容 */ private String jcnr; - /** 签名意义 */ - private String qmyy; + /** 稽查人id */ + private Long jcrId; - /** 签名人id */ - private Long qmrId; + /** 稽查人名称 */ + private String jcrMc; public Long getGyzjId() { return gyzjId; @@ -45,11 +45,11 @@ public class GyzjJcgj extends MpBaseEntity this.gyzjId = gyzjId; } - public String getJcgjlx() { + public Integer getJcgjlx() { return jcgjlx; } - public void setJcgjlx(String jcgjlx) { + public void setJcgjlx(Integer jcgjlx) { this.jcgjlx = jcgjlx; } @@ -77,19 +77,19 @@ public class GyzjJcgj extends MpBaseEntity this.jcnr = jcnr; } - public String getQmyy() { - return qmyy; + public Long getJcrId() { + return jcrId; } - public void setQmyy(String qmyy) { - this.qmyy = qmyy; + public void setJcrId(Long jcrId) { + this.jcrId = jcrId; } - public Long getQmrId() { - return qmrId; + public String getJcrMc() { + return jcrMc; } - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; + public void setJcrMc(String jcrMc) { + this.jcrMc = jcrMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 6ef9430..e9aae89 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -57,8 +57,127 @@ public class Mjy extends MpBaseEntity /** 表单id */ private Long bdId; - /** 试验id */ - private Long syId; + /** 目的id */ + private Long mdId; + + /** 名称编辑 */ + private String mcBj; + + /** 浓度编辑 */ + private String ndBj; + + /** 浓度单位编辑 */ + private String nddwBj; + + /** 库存编辑 */ + private String kcBj; + + /** 库存单位编辑 */ + private String kcdwBj; + + /** 失效日期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrqBj; + + /** 存储条件编辑 */ + private String cctjBj; + + /** 存储位置编辑 */ + private String ccwzBj; + + /** 编辑状态 1:未编辑 3:审核中 */ + private Integer bjzt; + + /** 库存状态 1:未编辑 3:审核中 */ + private Integer kczt; + + public Long getMdId() { + return mdId; + } + + public void setMdId(Long mdId) { + this.mdId = mdId; + } + + public String getNddwBj() { + return nddwBj; + } + + public void setNddwBj(String nddwBj) { + this.nddwBj = nddwBj; + } + + public String getKcdwBj() { + return kcdwBj; + } + + public void setKcdwBj(String kcdwBj) { + this.kcdwBj = kcdwBj; + } + + public String getMcBj() { + return mcBj; + } + + public void setMcBj(String mcBj) { + this.mcBj = mcBj; + } + + public String getNdBj() { + return ndBj; + } + + public void setNdBj(String ndBj) { + this.ndBj = ndBj; + } + + public String getKcBj() { + return kcBj; + } + + public void setKcBj(String kcBj) { + this.kcBj = kcBj; + } + + public Date getSxrqBj() { + return sxrqBj; + } + + public void setSxrqBj(Date sxrqBj) { + this.sxrqBj = sxrqBj; + } + + public String getCctjBj() { + return cctjBj; + } + + public void setCctjBj(String cctjBj) { + this.cctjBj = cctjBj; + } + + public String getCcwzBj() { + return ccwzBj; + } + + public void setCcwzBj(String ccwzBj) { + this.ccwzBj = ccwzBj; + } + + public Integer getBjzt() { + return bjzt; + } + + public void setBjzt(Integer bjzt) { + this.bjzt = bjzt; + } + + public Integer getKczt() { + return kczt; + } + + public void setKczt(Integer kczt) { + this.kczt = kczt; + } public void setMc(String mc) { @@ -184,14 +303,4 @@ public class Mjy extends MpBaseEntity return bdId; } - public void setSyId(Long syId) - { - this.syId = syId; - } - - public Long getSyId() - { - return syId; - } - } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java index f0ffd64..780431f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java @@ -10,60 +10,251 @@ import com.hxhq.common.core.domain.MpBaseEntity; * 麻精药-发放记录对象 t_mjy_ffjl * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ @TableName("t_mjy_ffjl") public class MjyFfjl extends MpBaseEntity { private static final long serialVersionUID = 1L; + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Long jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Long jyzt; + /** 麻精药id */ private Long mjyId; - /** 目的 */ - private String md; + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 浓度 */ + private String nd; - /** 转移条件 */ - private String zytj; + /** 浓度单位 */ + private String nddw; - /** 出库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date cksj; + /** 存储条件 */ + private String cctj; - /** 出库净重 */ - private String ckjz; + /** 存储位置 */ + private String ccwz; - /** 入库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date rksj; + /** 失效日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrq; - /** 入库净重 */ - private String rkjz; + /** 保存条件 */ + private String bctj; - /** 使用量 */ - private String syl; + /** 出库量 */ + private String ckl; - /** 领取人1 id */ + /** 出库量单位 */ + private String ckldw; + + /** 发放转移条件 */ + private String ffzytj; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1id */ private Long lqr1Id; - /** 领取人2 id */ + /** 领取人2id */ private Long lqr2Id; - /** 库管员1 id*/ - private Long kgy1Id; + /** 发放人1id */ + private Long ffr1Id; - /** 库管员2 id*/ - private Long kgy2Id; + /** 发放人2id */ + private Long ffr2Id; - /** 暂存柜id */ - private Long zckId; + /** 领取人1名称 */ + private String lqr1Mc; - /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ - private Integer jlzt; + /** 领取人2名称 */ + private String lqr2Mc; - /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ - private Integer jyzt; + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 领取日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lqrq; + + /** 发放备注 */ + private String ffbz; + + /** 归还转移条件 */ + private String ghzytj; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 归还人1id */ + private Long ghr1Id; + + /** 归还人2id */ + private Long ghr2Id; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人2id */ + private Long jsr2Id; + + /** 归还人1名称 */ + private String ghr1Mc; + + /** 归还人2名称 */ + private String ghr2Mc; + + /** 接收人1名称 */ + private String jsr1Mc; + + /** 接收人2名称 */ + private String jsr2Mc; + + /** 接收日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date jsrq; + + /** 归还备注 */ + private String ghbz; + + /** 归档申请人id */ + private Long 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 String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + public String 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 String getJsr1Mc() { + return jsr1Mc; + } + + public void setJsr1Mc(String jsr1Mc) { + this.jsr1Mc = jsr1Mc; + } + + public String getJsr2Mc() { + return jsr2Mc; + } + + public void setJsr2Mc(String jsr2Mc) { + this.jsr2Mc = jsr2Mc; + } + + 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 Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public void setJlzt(Long jlzt) + { + this.jlzt = jlzt; + } + + public Long getJlzt() + { + return jlzt; + } + + public void setJyzt(Long jyzt) + { + this.jyzt = jyzt; + } + public Long getJyzt() + { + return jyzt; + } public void setMjyId(Long mjyId) { @@ -75,134 +266,254 @@ public class MjyFfjl extends MpBaseEntity return mjyId; } - public void setMd(String md) + public void setMc(String mc) { - this.md = md; + this.mc = mc; } - public String getMd() + public String getMc() { - return md; + return mc; } - public void setZytj(String zytj) + public void setBh(String bh) { - this.zytj = zytj; + this.bh = bh; } - public String getZytj() + public String getBh() { - return zytj; + return bh; } - public void setCksj(Date cksj) + public void setNd(String nd) { - this.cksj = cksj; + this.nd = nd; } - public Date getCksj() + public String getNd() { - return cksj; + return nd; } - public void setCkjz(String ckjz) + public void setNddw(String nddw) { - this.ckjz = ckjz; + this.nddw = nddw; } - public String getCkjz() + public String getNddw() { - return ckjz; + return nddw; } - public void setRksj(Date rksj) + public void setCctj(String cctj) { - this.rksj = rksj; + this.cctj = cctj; } - public Date getRksj() + public String getCctj() { - return rksj; + return cctj; } - public void setRkjz(String rkjz) + public void setCcwz(String ccwz) { - this.rkjz = rkjz; + this.ccwz = ccwz; } - public String getRkjz() + public String getCcwz() { - return rkjz; + return ccwz; + } + + public Date getSxrq() { + return sxrq; } - public void setSyl(String syl) + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } + + public void setBctj(String bctj) { - this.syl = syl; + this.bctj = bctj; } - public String getSyl() + public String getBctj() { - return syl; + return bctj; } - public Long getLqr1Id() { - return lqr1Id; + 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 setFfzytj(String ffzytj) + { + this.ffzytj = ffzytj; } - public void setLqr1Id(Long lqr1Id) { + public String getFfzytj() + { + return ffzytj; + } + + public void setCkmz(String ckmz) + { + this.ckmz = ckmz; + } + + public String getCkmz() + { + return ckmz; + } + + public void setCkmzdw(String ckmzdw) + { + this.ckmzdw = ckmzdw; + } + + public String getCkmzdw() + { + return ckmzdw; + } + + public void setLqr1Id(Long lqr1Id) + { this.lqr1Id = lqr1Id; } - public Long getLqr2Id() { - return lqr2Id; + public Long getLqr1Id() + { + return lqr1Id; } - public void setLqr2Id(Long lqr2Id) { + public void setLqr2Id(Long lqr2Id) + { this.lqr2Id = lqr2Id; } - public Long getKgy1Id() { - return kgy1Id; + public Long getLqr2Id() + { + return lqr2Id; + } + + + public void setLqrq(Date lqrq) + { + this.lqrq = lqrq; } - public void setKgy1Id(Long kgy1Id) { - this.kgy1Id = kgy1Id; + public Date getLqrq() + { + return lqrq; } - public Long getKgy2Id() { - return kgy2Id; + public void setFfbz(String ffbz) + { + this.ffbz = ffbz; } - public void setKgy2Id(Long kgy2Id) { - this.kgy2Id = kgy2Id; + public String getFfbz() + { + return ffbz; } - public void setZckId(Long zckId) + public void setGhzytj(String ghzytj) { - this.zckId = zckId; + this.ghzytj = ghzytj; } - public Long getZckId() + public String getGhzytj() { - return zckId; + return ghzytj; } - public Integer getJlzt() { - return jlzt; + public void setRkl(String rkl) + { + this.rkl = rkl; } - public void setJlzt(Integer jlzt) { - this.jlzt = jlzt; + public String getRkl() + { + return rkl; } - public void setJyzt(Integer jyzt) + public void setRkldw(String rkldw) { - this.jyzt = jyzt; + this.rkldw = rkldw; } - public Integer getJyzt() + public String getRkldw() { - return jyzt; + return rkldw; + } + + 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 setJsrq(Date jsrq) + { + this.jsrq = jsrq; + } + + public Date getJsrq() + { + return jsrq; + } + + 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; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java index c7c86bf..aff1877 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java @@ -18,8 +18,8 @@ public class MjyJcgj extends MpBaseEntity /** 麻精药id */ private Long mjyId; - /** 稽查轨迹类型 */ - private String jcgjlx; + /** 稽查轨迹类型:1:流程；3：编辑 */ + private Integer jcgjlx; /** 稽查名称 */ private String jcmc; @@ -30,11 +30,11 @@ public class MjyJcgj extends MpBaseEntity /** 稽查内容 */ private String jcnr; - /** 签名意义 */ - private String qmyy; + /** 稽查人id */ + private Long jcrId; - /** 签名人id */ - private Long qmrId; + /** 稽查人名称 */ + private String jcrMc; public Long getMjyId() { return mjyId; @@ -44,11 +44,11 @@ public class MjyJcgj extends MpBaseEntity this.mjyId = mjyId; } - public String getJcgjlx() { + public Integer getJcgjlx() { return jcgjlx; } - public void setJcgjlx(String jcgjlx) { + public void setJcgjlx(Integer jcgjlx) { this.jcgjlx = jcgjlx; } @@ -76,19 +76,19 @@ public class MjyJcgj extends MpBaseEntity this.jcnr = jcnr; } - public String getQmyy() { - return qmyy; + public Long getJcrId() { + return jcrId; } - public void setQmyy(String qmyy) { - this.qmyy = qmyy; + public void setJcrId(Long jcrId) { + this.jcrId = jcrId; } - public Long getQmrId() { - return qmrId; + public String getJcrMc() { + return jcrMc; } - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; + public void setJcrMc(String jcrMc) { + this.jcrMc = jcrMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java new file mode 100644 index 0000000..e56b4a3 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java @@ -0,0 +1,51 @@ +package com.hxhq.business.enums.zykgl; + +/** + * 稽查轨迹类型:1:流程；3：编辑 + * @author tanfei + */ +public enum JcgjlxEnum { + + /** + * 流程 + */ + lc(1, "流程"), + + /** + * 编辑 + */ + bj(3, "编辑"); + + private int value; + private String text; + + JcgjlxEnum(int value, String text) { + this.value = value; + this.text = text; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public static JcgjlxEnum getEnumByValue(int type) { + for (JcgjlxEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java new file mode 100644 index 0000000..4ffcb83 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java @@ -0,0 +1,122 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class MjyBjForm { + + /** 麻精药id */ + private Long id; + + /** 名称编辑 */ + private String mcBj; + + /** 浓度编辑 */ + private String ndBj; + + /** 浓度单位编辑 */ + private String nddwBj; + + /** 失效日期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrqBj; + + /** 存储条件编辑 */ + private String cctjBj; + + /** 存储位置编辑 */ + private String ccwzBj; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private String qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public String getNddwBj() { + return nddwBj; + } + + public void setNddwBj(String nddwBj) { + this.nddwBj = nddwBj; + } + + public String getMcBj() { + return mcBj; + } + + public void setMcBj(String mcBj) { + this.mcBj = mcBj; + } + + public String getNdBj() { + return ndBj; + } + + public void setNdBj(String ndBj) { + this.ndBj = ndBj; + } + + public Date getSxrqBj() { + return sxrqBj; + } + + public void setSxrqBj(Date sxrqBj) { + this.sxrqBj = sxrqBj; + } + + public String getCctjBj() { + return cctjBj; + } + + public void setCctjBj(String cctjBj) { + this.cctjBj = cctjBj; + } + + public String getCcwzBj() { + return ccwzBj; + } + + public void setCcwzBj(String ccwzBj) { + this.ccwzBj = ccwzBj; + } + + public 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 getQmrId() { + return qmrId; + } + + public void setQmrId(String 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/mjy/MjyCzrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java new file mode 100644 index 0000000..eb36805 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyCzrqForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java new file mode 100644 index 0000000..a29dac5 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyCzyjForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java new file mode 100644 index 0000000..fe6b98a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java @@ -0,0 +1,161 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyFfForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 项目id */ + private Long xmId; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public Long getXmId() { + return xmId; + } + + public void setXmId(Long xmId) { + this.xmId = xmId; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java new file mode 100644 index 0000000..486fa0f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyGdForm { + + /** 麻精药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/mjy/MjyJdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java new file mode 100644 index 0000000..efe9b66 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyJdForm { + + /** 麻精药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/mjy/MjyJsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java new file mode 100644 index 0000000..e614661 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyJsForm { + + /** 麻精药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/mjy/MjyPlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java new file mode 100644 index 0000000..8128cdd --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java @@ -0,0 +1,119 @@ +package com.hxhq.business.form.mjy; + +import java.util.List; + +/** + * @author 15881 + */ +public class MjyPlffForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItemForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItemForm.java new file mode 100644 index 0000000..e5c60d1 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItemForm.java @@ -0,0 +1,75 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyPlffItemForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 项目id */ + private Long xmId; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public Long getXmId() { + return xmId; + } + + public void setXmId(Long xmId) { + this.xmId = xmId; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java new file mode 100644 index 0000000..595a05a --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjySdForm { + + /** 麻精药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/mjy/MjyShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java new file mode 100644 index 0000000..6158b44 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java @@ -0,0 +1,122 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class MjyShbjForm { + + /** 麻精药id */ + private Long id; + + /** 名称编辑 */ + private String mcBj; + + /** 浓度编辑 */ + private String ndBj; + + /** 浓度单位编辑 */ + private String nddwBj; + + /** 失效日期编辑 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrqBj; + + /** 存储条件编辑 */ + private String cctjBj; + + /** 存储位置编辑 */ + private String ccwzBj; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private String qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public String getNddwBj() { + return nddwBj; + } + + public void setNddwBj(String nddwBj) { + this.nddwBj = nddwBj; + } + + public String getMcBj() { + return mcBj; + } + + public void setMcBj(String mcBj) { + this.mcBj = mcBj; + } + + public String getNdBj() { + return ndBj; + } + + public void setNdBj(String ndBj) { + this.ndBj = ndBj; + } + + public Date getSxrqBj() { + return sxrqBj; + } + + public void setSxrqBj(Date sxrqBj) { + this.sxrqBj = sxrqBj; + } + + public String getCctjBj() { + return cctjBj; + } + + public void setCctjBj(String cctjBj) { + this.cctjBj = cctjBj; + } + + public String getCcwzBj() { + return ccwzBj; + } + + public void setCcwzBj(String ccwzBj) { + this.ccwzBj = ccwzBj; + } + + public 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 getQmrId() { + return qmrId; + } + + public void setQmrId(String 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/mjy/MjyShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java new file mode 100644 index 0000000..04acd30 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java @@ -0,0 +1,95 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyShxgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存编辑 */ + private String kcBj; + + /** 库存 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 库存单位编辑 */ + private String kcdwBj; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private String qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public String getKcdwBj() { + return kcdwBj; + } + + public void setKcdwBj(String kcdwBj) { + this.kcdwBj = kcdwBj; + } + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + 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 getQmrId() { + return qmrId; + } + + public void setQmrId(String qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public String getKcBj() { + return kcBj; + } + + public void setKcBj(String kcBj) { + this.kcBj = kcBj; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java new file mode 100644 index 0000000..e745165 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java @@ -0,0 +1,73 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyXgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存编辑 */ + private String kcBj;; + + /** 库存单位编辑 */ + private String kcdwBj; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private String qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public String getKcdwBj() { + return kcdwBj; + } + + public void setKcdwBj(String kcdwBj) { + this.kcdwBj = kcdwBj; + } + + public String getKcBj() { + return kcBj; + } + + public void setKcBj(String kcBj) { + this.kcBj = kcBj; + } + + 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 getQmrId() { + return qmrId; + } + + public void setQmrId(String 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/mjy/MjyYsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java new file mode 100644 index 0000000..f5200ae --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java @@ -0,0 +1,117 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class MjyYsffForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 暂存柜id */ + private Long zcgId; + + /** 备注 */ + private String remark; + + /** 钥匙1领取人ID */ + private Long lqr1Id; + + /** 钥匙2领取人ID */ + private Long lqr2Id; + + /** 钥匙1领取人密码 */ + private String lqr1mm; + + /** 钥匙2领取人密码 */ + private String lqr2mm; + + /** 发放人 */ + private Long ffrId; + + /** 发放人密码 */ + private String ffrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getZcgId() { + return zcgId; + } + + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfrId() { + return ffrId; + } + + public void setFfrId(Long ffrId) { + this.ffrId = ffrId; + } + + public String getFfrmm() { + return ffrmm; + } + + public void setFfrmm(String ffrmm) { + this.ffrmm = ffrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsffForm.java deleted file mode 100644 index 077de43..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsffForm.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.hxhq.business.form.zcg; - -import com.hxhq.business.domain.Zcg; - -/** - * @author 15881 - */ -public class YsffForm { - - - /** 暂存柜id */ - private Long id; - - /** 关联药剂 */ - private String glyj; - - /** 签名意义 */ - private String qmyy; - - /** 备注 */ - private String remark; - - /** 钥匙1领取人ID */ - private Long lqr1Id; - - /** 钥匙2领取人ID */ - private Long lqr2Id; - - /** 钥匙1领取人密码 */ - private String lqr1mm; - - /** 钥匙2领取人密码 */ - private String lqr2mm; - - /** 发放人 */ - private Long ffrId; - - /** 钥匙2领取人密码 */ - private String ffrmm; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getGlyj() { - return glyj; - } - - public void setGlyj(String glyj) { - this.glyj = glyj; - } - - public String getQmyy() { - return qmyy; - } - - public void setQmyy(String qmyy) { - this.qmyy = qmyy; - } - - 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/zcg/YsghForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsghForm.java deleted file mode 100644 index 86608d6..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/YsghForm.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hxhq.business.form.zcg; - -import com.hxhq.business.domain.Zcg; - -/** - * @author 15881 - */ -public class YsghForm { - /** 暂存柜id */ - private Long id; - - /** 暂存柜ids */ - private String[] ids; - - /** 签名意义 */ - private String qmyy; - - /** 钥匙1归还人ID */ - private Long ghr1Id; - - /** 钥匙2归还人ID */ - private Long ghr2Id; - - /** 钥匙1归还人密码 */ - private String ghr1mm; - - /** 钥匙2归还人密码 */ - private String ghr2mm; - - /** 接收人id */ - private Long jsrId; - - /** 接收人密码 */ - private String jsrmm; - - public String[] getIds() { - return ids; - } - - public void setIds(String[] ids) { - this.ids = ids; - } - - public Long getJsrId() { - return jsrId; - } - - public void setJsrId(Long jsrId) { - this.jsrId = jsrId; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getQmyy() { - return qmyy; - } - - public void setQmyy(String qmyy) { - this.qmyy = qmyy; - } - - public Long getGhr1Id() { - return ghr1Id; - } - - public void setGhr1Id(Long ghr1Id) { - this.ghr1Id = ghr1Id; - } - - public Long getGhr2Id() { - return ghr2Id; - } - - public void setGhr2Id(Long ghr2Id) { - this.ghr2Id = ghr2Id; - } - - public String getGhr1mm() { - return ghr1mm; - } - - public void setGhr1mm(String ghr1mm) { - this.ghr1mm = ghr1mm; - } - - public String getGhr2mm() { - return ghr2mm; - } - - public void setGhr2mm(String ghr2mm) { - this.ghr2mm = ghr2mm; - } - - public String getJsrmm() { - return jsrmm; - } - - public void setJsrmm(String jsrmm) { - this.jsrmm = jsrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsffForm.java new file mode 100644 index 0000000..b9daa09 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsffForm.java @@ -0,0 +1,120 @@ +package com.hxhq.business.form.zcg; + +import com.hxhq.business.domain.Zcg; + +/** + * @author 15881 + */ +public class ZcgYsffForm { + + + /** 暂存柜id */ + private Long id; + + /** 关联药剂 */ + private String glyj; + + /** 签名意义 */ + private String qmyy; + + /** 备注 */ + private String remark; + + /** 钥匙1领取人ID */ + private Long lqr1Id; + + /** 钥匙2领取人ID */ + private Long lqr2Id; + + /** 钥匙1领取人密码 */ + private String lqr1mm; + + /** 钥匙2领取人密码 */ + private String lqr2mm; + + /** 发放人 */ + private Long ffrId; + + /** 发放人密码 */ + private String ffrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGlyj() { + return glyj; + } + + public void setGlyj(String glyj) { + this.glyj = glyj; + } + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } + + 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/zcg/ZcgYsghForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsghForm.java new file mode 100644 index 0000000..ee96311 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/zcg/ZcgYsghForm.java @@ -0,0 +1,107 @@ +package com.hxhq.business.form.zcg; + +import com.hxhq.business.domain.Zcg; + +/** + * @author 15881 + */ +public class ZcgYsghForm { + /** 暂存柜id */ + private Long id; + + /** 暂存柜ids */ + private Long[] ids; + + /** 签名意义 */ + private String qmyy; + + /** 钥匙1归还人ID */ + private Long ghr1Id; + + /** 钥匙2归还人ID */ + private Long ghr2Id; + + /** 钥匙1归还人密码 */ + private String ghr1mm; + + /** 钥匙2归还人密码 */ + private String ghr2mm; + + /** 接收人id */ + private Long jsrId; + + /** 接收人密码 */ + private String jsrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getJsrId() { + return jsrId; + } + + public void setJsrId(Long jsrId) { + this.jsrId = jsrId; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } + + public Long getGhr1Id() { + return ghr1Id; + } + + public void setGhr1Id(Long ghr1Id) { + this.ghr1Id = ghr1Id; + } + + public Long getGhr2Id() { + return ghr2Id; + } + + public void setGhr2Id(Long ghr2Id) { + this.ghr2Id = ghr2Id; + } + + public String getGhr1mm() { + return ghr1mm; + } + + public void setGhr1mm(String ghr1mm) { + this.ghr1mm = ghr1mm; + } + + public String getGhr2mm() { + return ghr2mm; + } + + public void setGhr2mm(String ghr2mm) { + this.ghr2mm = ghr2mm; + } + + public String getJsrmm() { + return jsrmm; + } + + public void setJsrmm(String jsrmm) { + this.jsrmm = jsrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java index 768d0ad..ff7029f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjFfjlMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 给药制剂-发放记录Mapper接口 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ public interface GyzjFfjlMapper extends BaseMapper { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java index 1c8f671..8dc207d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 麻精药-发放记录Mapper接口 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ public interface MjyFfjlMapper extends BaseMapper { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 56ae8a7..7960f81 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 给药制剂-发放记录Service接口 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ public interface IGyzjFfjlService extends IService { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java index 568672e..e9fe6af 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GyzjJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.GyzjJcgj; /** * 给药制剂-稽查轨迹Service接口 @@ -13,11 +14,22 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IGyzjJcgjService extends IService { /** - * 查询给药制剂-稽查轨迹列表 - * - * @param gyzjJcgj 给药制剂-稽查轨迹 - * @return 给药制剂-稽查轨迹集合 + * 查询稽查轨迹列表 + * @param gyzjId 给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @return */ - public List queryList(GyzjJcgj gyzjJcgj); + public List queryListByGyzjId(Long gyzjId, Integer jcgjlx); + /** + * 新增稽查轨迹 + * @param gyzjId 麻给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java index 931498e..bfa8fd2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 麻精药-发放记录Service接口 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ public interface IMjyFfjlService extends IService { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java index 3f8aa63..3dd6cec 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java @@ -1,6 +1,8 @@ package com.hxhq.business.service; import java.util.List; + +import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.MjyJcgj; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,11 +15,23 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IMjyJcgjService extends IService { /** - * 查询麻精药-稽查轨迹列表 - * - * @param mjyJcgj 麻精药-稽查轨迹 - * @return 麻精药-稽查轨迹集合 + * 查询稽查轨迹列表 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @return + */ + public List queryListByMjyId(Long mjyId, Integer jcgjlx); + + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 */ - public List queryList(MjyJcgj mjyJcgj); + public void saveJcgj(Long mjyId, 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/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index 6c288f9..bfb029b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java @@ -3,10 +3,10 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.Mjy; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.domain.Zcg; import com.hxhq.business.dto.mjy.MjyDto; -import com.hxhq.business.form.mjy.MjySearchForm; -import com.hxhq.business.form.zcg.ZcgSearchForm; +import com.hxhq.business.form.mjy.*; +; +import org.springframework.web.bind.annotation.RequestBody; /** * 麻精药Service接口 @@ -32,4 +32,99 @@ public interface IMjyService extends IService */ public Mjy queryInfo(Long id); + /** + * 解档 + * + * @param form + */ + public void jd(@RequestBody MjyJdForm form); + + /** + * 批量归档 + * + * @param form + */ + public void plgd(@RequestBody MjyGdForm form); + + /** + * 归档 + * + * @param form + */ + public void gd(@RequestBody MjyGdForm form); + + + /** + * 批量锁定 + * + * @param form + */ + public void plsd(@RequestBody MjySdForm form); + + /** + * 锁定 + * + * @param form + */ + public void sd(@RequestBody MjySdForm form); + + /** + * 解锁 + * + * @param form + */ + public void js(@RequestBody MjyJsForm form); + + /** + * 批量处置药剂 + * + * @param form + */ + public void plczyj(@RequestBody MjyCzyjForm form); + + /** + * 处置药剂 + * + * @param form + */ + public void czyj(@RequestBody MjyCzyjForm form); + + /** + * 批量处置容器 + * + * @param form + */ + public void plczrq(@RequestBody MjyCzrqForm form); + + /** + * 处置容器 + * + * @param form + */ + public void czrq(@RequestBody MjyCzrqForm form); + + + /** + * 钥匙发放 + * + * @param form + */ + public void ysff(@RequestBody MjyYsffForm form); + + + /** + * 发放 + * + * @param form + */ + public void ff(@RequestBody MjyFfForm form); + + + /** + * 批量发放 + * + * @param form + */ + public void plff(@RequestBody MjyPlffForm form); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IZcgService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IZcgService.java index 50a0112..bd81384 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IZcgService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IZcgService.java @@ -1,13 +1,12 @@ package com.hxhq.business.service; import java.util.List; -import java.util.Map; import com.hxhq.business.domain.Zcg; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.zcg.ZcgDto; -import com.hxhq.business.form.zcg.YsffForm; -import com.hxhq.business.form.zcg.YsghForm; +import com.hxhq.business.form.zcg.ZcgYsffForm; +import com.hxhq.business.form.zcg.ZcgYsghForm; import com.hxhq.business.form.zcg.ZcgSearchForm; /** @@ -40,7 +39,7 @@ public interface IZcgService extends IService * * @param form */ - public void ysgh(YsghForm form); + public void ysgh(ZcgYsghForm form); /** @@ -48,13 +47,13 @@ public interface IZcgService extends IService * * @param form */ - public void ysghBatch(YsghForm form); + public void ysghBatch(ZcgYsghForm form); /** * 钥匙发放 * * @param form */ - public void ysff(YsffForm form); + public void ysff(ZcgYsffForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 3d054da..1f9a6d5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * 给药制剂-发放记录Service业务层处理 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ @Service public class GyzjFfjlServiceImpl extends ServiceImpl implements IGyzjFfjlService diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index bdabe46..177d977 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -3,6 +3,7 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.MjyJcgj; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjJcgjMapper; import com.hxhq.business.domain.GyzjJcgj; @@ -19,16 +20,45 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class GyzjJcgjServiceImpl extends ServiceImpl implements IGyzjJcgjService { /** - * 查询给药制剂-稽查轨迹列表 - * - * @param gyzjJcgj 给药制剂-稽查轨迹 - * @return 给药制剂-稽查轨迹 + * 查询稽查轨迹列表 + * @param gyzjId 麻给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @return */ @Override - public List queryList(GyzjJcgj gyzjJcgj) - { + public List queryListByGyzjId(Long gyzjId, Integer jcgjlx){ QueryWrapper queryWrapper = Wrappers.query(); + if(gyzjId==null){ + throw new SecurityException("麻精药id不能为空"); + } + queryWrapper.eq("gyzj_id",gyzjId); + if(jcgjlx!=null&&jcgjlx.intValue()>0){ + queryWrapper.eq("jcgjlx",jcgjlx); + } + queryWrapper.orderByDesc("id"); return this.list(queryWrapper); } + /** + * 新增稽查轨迹 + * @param gyzjId 给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + @Override + public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjId); + gyzjJcgj.setJcgjlx(jcgjlx); + gyzjJcgj.setJcmc(jcmc); + gyzjJcgj.setJcmcys(jcmcys); + gyzjJcgj.setJcnr(jcnr); + gyzjJcgj.setJcrId(jcrId); + gyzjJcgj.setJcrMc(jcrMc); + this.save(gyzjJcgj); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 2e5a2de..2d5acec 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * 麻精药-发放记录Service业务层处理 * * @author hxhq - * @date 2025-12-18 + * @date 2025-12-21 */ @Service public class MjyFfjlServiceImpl extends ServiceImpl implements IMjyFfjlService diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java index 764f871..4320b50 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java @@ -3,6 +3,8 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.business.domain.MjyJcgj; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.MjyJcgjMapper; import com.hxhq.business.domain.MjyJcgj; @@ -18,17 +20,48 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class MjyJcgjServiceImpl extends ServiceImpl implements IMjyJcgjService { + /** - * 查询麻精药-稽查轨迹列表 - * - * @param mjyJcgj 麻精药-稽查轨迹 - * @return 麻精药-稽查轨迹 + * 查询稽查轨迹列表 + * @param mjyId 麻给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @return */ @Override - public List queryList(MjyJcgj mjyJcgj) - { + public List queryListByMjyId(Long mjyId, Integer jcgjlx){ QueryWrapper queryWrapper = Wrappers.query(); + if(mjyId==null){ + throw new SecurityException("麻精药id不能为空"); + } + queryWrapper.eq("mjy_id",mjyId); + if(jcgjlx!=null&&jcgjlx.intValue()>0){ + queryWrapper.eq("jcgjlx",jcgjlx); + } + queryWrapper.orderByDesc("id"); return this.list(queryWrapper); } + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + @Override + public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + MjyJcgj mjyJcgj = new MjyJcgj(); + mjyJcgj.setMjyId(mjyId); + mjyJcgj.setJcgjlx(jcgjlx); + mjyJcgj.setJcmc(jcmc); + mjyJcgj.setJcmcys(jcmcys); + mjyJcgj.setJcnr(jcnr); + mjyJcgj.setJcrId(jcrId); + mjyJcgj.setJcrMc(jcrMc); + this.save(mjyJcgj); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index 6f5b95c..d8b8568 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -1,18 +1,34 @@ package com.hxhq.business.service.impl; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hxhq.business.domain.Zcg; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.business.domain.*; import com.hxhq.business.dto.mjy.MjyDto; -import com.hxhq.business.form.mjy.MjySearchForm; -import com.hxhq.business.form.zcg.ZcgSearchForm; +import com.hxhq.business.enums.zykgl.JcgjlxEnum; +import com.hxhq.business.enums.zykgl.JcmcysEnum; +import com.hxhq.business.enums.zykgl.ZjztEnum; +import com.hxhq.business.form.mjy.*; +import com.hxhq.business.service.IMjyFfjlService; +import com.hxhq.business.service.IMjyJcgjService; +import com.hxhq.common.core.text.Convert; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.MjyMapper; import com.hxhq.business.domain.Mjy; import com.hxhq.business.service.IMjyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.bind.annotation.RequestBody; /** * 麻精药Service业务层处理 @@ -21,8 +37,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @date 2025-12-18 */ @Service -public class MjyServiceImpl extends ServiceImpl implements IMjyService -{ +public class MjyServiceImpl extends ServiceImpl implements IMjyService { + @Autowired + private ISysUserService sysUserService; + @Autowired + private IMjyJcgjService mjyJcgjService; + @Autowired + private IMjyFfjlService mjyFfjlService; + /** * 查询麻精药列表 * @@ -69,4 +91,508 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS return baseMapper.queryInfo(id); } + /** + * 解档 + * + * @param form + */ + @Override + public void jd(@RequestBody MjyJdForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】未归档，不能解档"); + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + //新增申请解档 todo + //稽查轨迹 + String jcnr = "备注：" + form.getRemark() + + ";签名意义：申请解档" + + ";签名人：" + qmr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 批量归档 + * + * @param form + */ + @Override + public void plgd(@RequestBody MjyGdForm form) { + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List mjyList = this.list(queryWrapper); + List mjyJcgjList = new ArrayList<>(); + if (mjyList.size() > 0) { + for (Mjy mjy : mjyList) { + if (!mjy.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + mjy.getMc() + "】不是锁定状态，不能归档"); + } + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + for (Mjy mjy : mjyList) { + //锁定 + mjy.setZjzt(ZjztEnum.ysd.getValue()); + //稽查轨迹 + MjyJcgj mjyJcgj = new MjyJcgj(); + mjyJcgj.setMjyId(mjy.getId()); + mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + mjyJcgj.setJcmc("申请归档"); + mjyJcgj.setJcmcys(JcmcysEnum.wsd.getValue()); + String jcnr = "备注：" + form.getRemark() + + ";签名意义：申请归档" + + ";签名人：" + qmr.getNickName(); + mjyJcgj.setJcnr(jcnr); + mjyJcgj.setJcrId(SecurityUtils.getUserId()); + mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgjList.add(mjyJcgj); + } + this.saveOrUpdateBatch(mjyList); + mjyJcgjService.saveBatch(mjyJcgjList); + } + } + + /** + * 归档 + * + * @param form + */ + @Override + public void gd(@RequestBody MjyGdForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是锁定状态，不能归档"); + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + //新增归档申请 todo + //稽查轨迹 + String jcnr = "备注：" + form.getRemark() + + ";签名意义：申请归档" + + ";签名人：" + qmr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + + /** + * 批量锁定 + * + * @param form + */ + @Override + public void plsd(@RequestBody MjySdForm form) { + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List mjyList = this.list(queryWrapper); + List mjyJcgjList = new ArrayList<>(); + if (mjyList.size() > 0) { + for (Mjy mjy : mjyList) { + if (!mjy.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjy.getMc() + "】不是入库状态，不能锁定"); + } + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + for (Mjy mjy : mjyList) { + //锁定 + mjy.setZjzt(ZjztEnum.ysd.getValue()); + //稽查轨迹 + MjyJcgj mjyJcgj = new MjyJcgj(); + mjyJcgj.setMjyId(mjy.getId()); + mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); + mjyJcgj.setJcmc("锁定麻精药"); + mjyJcgj.setJcmcys(JcmcysEnum.wsd.getValue()); + String jcnr = "备注：" + form.getRemark() + + ";签名意义：锁定麻精药" + + ";签名人：" + qmr.getNickName(); + mjyJcgj.setJcnr(jcnr); + mjyJcgj.setJcrId(SecurityUtils.getUserId()); + mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgjList.add(mjyJcgj); + } + this.saveOrUpdateBatch(mjyList); + mjyJcgjService.saveBatch(mjyJcgjList); + } + + } + + /** + * 锁定 + * + * @param form + */ + @Override + public void sd(@RequestBody MjySdForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能锁定"); + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + mjyOld.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + String jcnr = "备注：" + form.getRemark() + + ";签名意义：锁定麻精药" + + ";签名人：" + qmr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + + /** + * 解锁 + * + * @param form + */ + @Override + public void js(@RequestBody MjyJsForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是已锁定状态，不能解锁"); + } + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + mjyOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + String jcnr = "备注：" + form.getRemark() + + ";签名意义：解锁麻精药" + + ";签名人：" + qmr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + } + + /** + * 批量处置药剂 + * + * @param form + */ + @Override + public void plczyj(@RequestBody MjyCzyjForm form) { + + } + + + /** + * 处置药剂 + * + * @param form + */ + @Override + public void czyj(@RequestBody MjyCzyjForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能处置药剂"); + } + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + + mjyOld.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + String jcnr = "处置方式：" + form.getCzfs() + + ";处置原因：" + form.getCzyy() + + ";处置人：" + clr.getNickName() + + ";复核人：" + fhr.getNickName() + + ";监督人：" + jdr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + } + + + /** + * 批量处置容器 + * + * @param form + */ + @Override + public void plczrq(@RequestBody MjyCzrqForm form) { + + } + + /** + * 处置容器 + * + * @param form + */ + @Override + public void czrq(@RequestBody MjyCzrqForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能处置容器"); + } + SysUser clr = sysUserService.selectUserById(form.getClrId()); + if (clr == null) { + throw new SecurityException("处理人不存在"); + } + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + if (fhr == null) { + throw new SecurityException("复核人不存在"); + } + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + if (jdr == null) { + throw new SecurityException("监督人不存在"); + } + //验证处理人，复核人，监督人密码 todo + + mjyOld.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + String jcnr = "处置方式：" + form.getCzfs() + + ";处置原因：" + form.getCzyy() + + ";处置人：" + clr.getNickName() + + ";复核人：" + fhr.getNickName() + + ";监督人：" + jdr.getNickName(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + } + + + /** + * 钥匙发放 + * + * @param form + */ + @Override + public void ysff(@RequestBody MjyYsffForm form) { + + } + + + /** + * 发放 + * + * @param form + */ + @Override + public void ff(@RequestBody MjyFfForm form) { + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new SecurityException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能发放"); + } + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + if (lqr1 == null) { + throw new SecurityException("领取人1不存在"); + } + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + if (lqr2 == null) { + throw new SecurityException("领取人2不存在"); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + if (ffr1 == null) { + throw new SecurityException("发放人1不存在"); + } + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + if (ffr2 == null) { + throw new SecurityException("发放人2不存在"); + } + //验证领取人1、领取人2、发放人1、发放人2密码 todo + + //发放记录 + MjyFfjl mjyFfjl=new MjyFfjl(); + mjyFfjl.setMjyId(mjyOld.getId()); + mjyFfjl.setMc(mjyOld.getMc()); + mjyFfjl.setBh(mjyOld.getBh()); + mjyFfjl.setNd(mjyOld.getNd()); + mjyFfjl.setNddw(mjyOld.getNddw()); + mjyFfjl.setCctj(mjyOld.getCctj()); + mjyFfjl.setCcwz(mjyOld.getCcwz()); + mjyFfjl.setSxrq(mjyOld.getSxrq()); + mjyFfjl.setCctj(mjyOld.getCctj()); + mjyFfjl.setCkl(mjyOld.getKc()); + + mjyFfjl.setCkldw(mjyOld.getKcdw()); + mjyFfjl.setFfzytj(form.getZytj()); + mjyFfjl.setCkmz(form.getCkmz()); + mjyFfjl.setCkmzdw(form.getCkmzdw()); + mjyFfjl.setLqr1Id(lqr1.getUserId()); + mjyFfjl.setLqr2Id(lqr2.getUserId()); + mjyFfjl.setFfr1Id(ffr1.getUserId()); + mjyFfjl.setFfr2Id(ffr2.getUserId()); + mjyFfjl.setLqr1Mc(lqr1.getNickName()); + mjyFfjl.setLqr2Mc(lqr2.getNickName()); + mjyFfjl.setFfr1Mc(ffr1.getNickName()); + mjyFfjl.setFfr2Mc(ffr2.getNickName()); + + mjyFfjl.setLqrq(new Date()); + mjyFfjl.setFfbz(form.getRemark()); + + mjyFfjlService.save(mjyFfjl); + + //稽查轨迹 + String jcnr = "出库量：" + mjyOld.getKc() + + ";转移条件：" + form.getZytj() + + ";出库毛重：" + form.getCkmz()+mjyOld.getKcdw() + + ";目的：" + form.getXmId() + + ";备注：" + form.getRemark(); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + //发放 是否关联最后一次发放记录？ + mjyOld.setZjzt(ZjztEnum.yff.getValue()); + mjyOld.setKc("0"); + this.updateById(mjyOld); + + } + + + /** + * 批量发放 + * + * @param form + */ + @Override + public void plff(@RequestBody MjyPlffForm form) { + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + if (form.getList().size() < 0) { + throw new SecurityException("参数list不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List mjyList = this.list(queryWrapper); + if (mjyList.size() > 0) { + for (Mjy mjy : mjyList) { + if (!mjy.getZjzt().equals(ZjztEnum.rk.getValue())) { + throw new SecurityException("麻精药【" + mjy.getMc() + "】不是入库状态，不能发放"); + } + //验证库存 + Double kc=Convert.toDouble(mjy.getKc()); + if(kc<=0){ + throw new SecurityException("麻精药【" + mjy.getMc() + "】库存不足，不能发放"); + } + } + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + if (lqr1 == null) { + throw new SecurityException("领取人1不存在"); + } + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + if (lqr2 == null) { + throw new SecurityException("领取人2不存在"); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + if (ffr1 == null) { + throw new SecurityException("发放人1不存在"); + } + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + if (ffr2 == null) { + throw new SecurityException("发放人2不存在"); + } + //验证领取人1、领取人2、发放人1、发放人2密码 todo + for (Mjy mjy : mjyList) { + + List mjyPlffItemFilter = form.getList().stream() + .filter(p -> p.getId().equals(mjy.getId())) + .collect(Collectors.toList()); + if(mjyPlffItemFilter.size()>0){ + + //发放记录 + MjyFfjl mjyFfjl=new MjyFfjl(); + mjyFfjl.setMjyId(mjy.getId()); + mjyFfjl.setMc(mjy.getMc()); + mjyFfjl.setBh(mjy.getBh()); + mjyFfjl.setNd(mjy.getNd()); + mjyFfjl.setNddw(mjy.getNddw()); + mjyFfjl.setCctj(mjy.getCctj()); + mjyFfjl.setCcwz(mjy.getCcwz()); + mjyFfjl.setSxrq(mjy.getSxrq()); + mjyFfjl.setCctj(mjy.getCctj()); + mjyFfjl.setCkl(mjy.getKc()); + + mjyFfjl.setCkldw(mjy.getKcdw()); + mjyFfjl.setFfzytj(mjyPlffItemFilter.get(0).getZytj()); + mjyFfjl.setCkmz(mjyPlffItemFilter.get(0).getCkmz()); + mjyFfjl.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw()); + mjyFfjl.setLqr1Id(lqr1.getUserId()); + mjyFfjl.setLqr2Id(lqr2.getUserId()); + mjyFfjl.setFfr1Id(ffr1.getUserId()); + mjyFfjl.setFfr2Id(ffr2.getUserId()); + mjyFfjl.setLqr1Mc(lqr1.getNickName()); + mjyFfjl.setLqr2Mc(lqr2.getNickName()); + mjyFfjl.setFfr1Mc(ffr1.getNickName()); + mjyFfjl.setFfr2Mc(ffr2.getNickName()); + + mjyFfjl.setLqrq(new Date()); + mjyFfjl.setFfbz(mjyPlffItemFilter.get(0).getRemark()); + + mjyFfjlService.save(mjyFfjl); + + //稽查轨迹 + String jcnr = "出库量：" + mjy.getKc() + + ";转移条件：" + mjyPlffItemFilter.get(0).getZytj() + + ";出库毛重：" + mjyPlffItemFilter.get(0).getCkmz()+mjy.getKcdw() + + ";目的：" + mjyPlffItemFilter.get(0).getXmId() + + ";备注：" + mjyPlffItemFilter.get(0).getRemark(); + mjyJcgjService.saveJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + + //发放 是否关联最后一次发放记录？ + mjy.setZjzt(ZjztEnum.yff.getValue()); + mjy.setKc("0"); + this.updateById(mjy); + } + } + + } + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java index e20ad0c..2ba782a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java @@ -3,16 +3,14 @@ package com.hxhq.business.service.impl; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.ZcgTz; import com.hxhq.business.dto.zcg.ZcgDto; -import com.hxhq.business.enums.zykgl.JyztEnum; import com.hxhq.business.enums.zykgl.zcgJyztEnum; -import com.hxhq.business.form.zcg.YsffForm; -import com.hxhq.business.form.zcg.YsghForm; +import com.hxhq.business.form.zcg.ZcgYsffForm; +import com.hxhq.business.form.zcg.ZcgYsghForm; import com.hxhq.business.form.zcg.ZcgSearchForm; import com.hxhq.business.service.IZcgTzService; import com.hxhq.common.core.utils.StringUtils; @@ -85,7 +83,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS */ @Override @Transactional(rollbackFor = Exception.class) - public void ysgh(YsghForm form) { + public void ysgh(ZcgYsghForm form) { if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -138,7 +136,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS */ @Override @Transactional(rollbackFor = Exception.class) - public void ysghBatch(YsghForm form) { + public void ysghBatch(ZcgYsghForm form) { if (form.getIds().length<0) { throw new SecurityException("参数ids不正确"); } @@ -161,6 +159,8 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS if (!zcg.getZt().equals(zcgJyztEnum.jyz.getValue())) { throw new SecurityException("暂存柜" + zcg.getMc() + "未借用"); } + } + for (Zcg zcg : zcgList) { zcg.setLqr1Id(null); zcg.setLqr1Mc(null); zcg.setLqr2Id(null); @@ -196,7 +196,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS */ @Override @Transactional(rollbackFor = Exception.class) - public void ysff(YsffForm form) { + public void ysff(ZcgYsffForm form) { if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); }