From af5ab8d04c18531e6c09f4c75fe22f6e34f436fa Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 25 Dec 2025 13:54:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=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=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/MjyController.java | 47 ++-- .../business/controller/MjyFfjlController.java | 115 +++++++++ .../java/com/hxhq/business/domain/GyzjFfjl.java | 57 +++-- .../main/java/com/hxhq/business/domain/GyzjTz.java | 139 ++++++----- .../main/java/com/hxhq/business/domain/Mjy.java | 30 +-- .../java/com/hxhq/business/domain/MjyFfjl.java | 57 ++++- .../com/hxhq/business/dto/mjy/MjyFfjlListDto.java | 254 +++++++++++++++++++ .../java/com/hxhq/business/dto/mjy/MjyListDto.java | 12 +- .../java/com/hxhq/business/form/mjy/BjForm.java | 164 ++++++++++++ .../java/com/hxhq/business/form/mjy/CzrqForm.java | 106 ++++++++ .../java/com/hxhq/business/form/mjy/CzyjForm.java | 117 +++++++++ .../java/com/hxhq/business/form/mjy/FfForm.java | 161 ++++++++++++ .../com/hxhq/business/form/mjy/FfjlGdForm.java | 62 +++++ .../com/hxhq/business/form/mjy/FfjlJdForm.java | 52 ++++ .../com/hxhq/business/form/mjy/FfjlJsForm.java | 51 ++++ .../com/hxhq/business/form/mjy/FfjlSdForm.java | 62 +++++ .../com/hxhq/business/form/mjy/FfjlSearchForm.java | 106 ++++++++ .../java/com/hxhq/business/form/mjy/GdForm.java | 62 +++++ .../java/com/hxhq/business/form/mjy/GhForm.java | 62 +++++ .../java/com/hxhq/business/form/mjy/JdForm.java | 51 ++++ .../java/com/hxhq/business/form/mjy/JsForm.java | 51 ++++ .../java/com/hxhq/business/form/mjy/MjyBjForm.java | 164 ------------ .../com/hxhq/business/form/mjy/MjyCzrqForm.java | 106 -------- .../com/hxhq/business/form/mjy/MjyCzyjForm.java | 117 --------- .../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/MjyPlczrqForm.java | 99 -------- .../com/hxhq/business/form/mjy/MjyPlczrqItem.java | 40 --- .../com/hxhq/business/form/mjy/MjyPlczyjForm.java | 97 -------- .../com/hxhq/business/form/mjy/MjyPlczyjItem.java | 51 ---- .../com/hxhq/business/form/mjy/MjyPlffForm.java | 119 --------- .../com/hxhq/business/form/mjy/MjyPlffItem.java | 75 ------ .../java/com/hxhq/business/form/mjy/MjySdForm.java | 62 ----- .../com/hxhq/business/form/mjy/MjySearchForm.java | 77 ------ .../com/hxhq/business/form/mjy/MjyShbjForm.java | 66 ----- .../com/hxhq/business/form/mjy/MjyShxgkcForm.java | 86 ------- .../com/hxhq/business/form/mjy/MjyXgkcForm.java | 77 ------ .../com/hxhq/business/form/mjy/MjyYsffForm.java | 117 --------- .../com/hxhq/business/form/mjy/PlczrqForm.java | 99 ++++++++ .../com/hxhq/business/form/mjy/PlczrqItem.java | 40 +++ .../com/hxhq/business/form/mjy/PlczyjForm.java | 97 ++++++++ .../com/hxhq/business/form/mjy/PlczyjItem.java | 51 ++++ .../java/com/hxhq/business/form/mjy/PlffForm.java | 119 +++++++++ .../java/com/hxhq/business/form/mjy/PlffItem.java | 75 ++++++ .../java/com/hxhq/business/form/mjy/SdForm.java | 62 +++++ .../com/hxhq/business/form/mjy/SearchForm.java | 77 ++++++ .../java/com/hxhq/business/form/mjy/ShbjForm.java | 66 +++++ .../com/hxhq/business/form/mjy/ShxgkcForm.java | 86 +++++++ .../java/com/hxhq/business/form/mjy/XgkcForm.java | 77 ++++++ .../java/com/hxhq/business/form/mjy/YsffForm.java | 117 +++++++++ .../com/hxhq/business/mapper/MjyFfjlMapper.java | 15 +- .../java/com/hxhq/business/mapper/MjyMapper.java | 4 +- .../com/hxhq/business/service/IMjyFfjlService.java | 49 +++- .../com/hxhq/business/service/IMjyService.java | 36 +-- .../business/service/impl/MjyFfjlServiceImpl.java | 277 ++++++++++++++++++++- .../hxhq/business/service/impl/MjyServiceImpl.java | 82 +++--- .../resources/mapper/business/MjyFfjlMapper.xml | 12 + .../main/resources/mapper/business/MjyMapper.xml | 2 +- 60 files changed, 3066 insertions(+), 1873 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzrqForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzyjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlGdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJsForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JsForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqItem.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjItem.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItem.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySearchForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqItem.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjItem.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffItem.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SdForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/XgkcForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/YsffForm.java 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 19393ea..4b23107 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 @@ -40,7 +40,7 @@ public class MjyController extends BaseController */ @RequiresPermissions("business:resource:mjy:list") @GetMapping("/list") - public TableDataInfo list(MjySearchForm form) + public TableDataInfo list(SearchForm form) { startPage(); List list = mjyService.queryList(form); @@ -86,7 +86,7 @@ public class MjyController extends BaseController */ @PostMapping("/jd") @RequiresPermissions("business:resource:mjy:jd") - public AjaxResult jd(@RequestBody MjyJdForm form) + public AjaxResult jd(@RequestBody JdForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.jd(form); @@ -98,7 +98,7 @@ public class MjyController extends BaseController */ @PostMapping("/plgd") @RequiresPermissions("business:resource:mjy:gd") - public AjaxResult plgd(@RequestBody MjyGdForm form) + public AjaxResult plgd(@RequestBody GdForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.plgd(form); @@ -110,7 +110,7 @@ public class MjyController extends BaseController */ @PostMapping("/gd") @RequiresPermissions("business:resource:mjy:gd") - public AjaxResult gd(@RequestBody MjyGdForm form) + public AjaxResult gd(@RequestBody GdForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.gd(form); @@ -123,7 +123,7 @@ public class MjyController extends BaseController */ @PostMapping("/plsd") @RequiresPermissions("business:resource:mjy:sd") - public AjaxResult plsd(@RequestBody MjySdForm form) + public AjaxResult plsd(@RequestBody SdForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.plsd(form); @@ -135,7 +135,7 @@ public class MjyController extends BaseController */ @PostMapping("/sd") @RequiresPermissions("business:resource:mjy:sd") - public AjaxResult sd(@RequestBody MjySdForm form) + public AjaxResult sd(@RequestBody SdForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.sd(form); @@ -148,7 +148,7 @@ public class MjyController extends BaseController */ @PostMapping("/js") @RequiresPermissions("business:resource:mjy:js") - public AjaxResult js(@RequestBody MjyJsForm form) + public AjaxResult js(@RequestBody JsForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.js(form); @@ -160,7 +160,7 @@ public class MjyController extends BaseController */ @PostMapping("/plczyj") @RequiresPermissions("business:resource:mjy:czyj") - public AjaxResult plczyj(@RequestBody MjyPlczyjForm form) + public AjaxResult plczyj(@RequestBody PlczyjForm form) { form.setClrId(SecurityUtils.getUserId()); mjyService.plczyj(form); @@ -172,7 +172,7 @@ public class MjyController extends BaseController */ @PostMapping("/czyj") @RequiresPermissions("business:resource:mjy:czyj") - public AjaxResult czyj(@RequestBody MjyCzyjForm form) + public AjaxResult czyj(@RequestBody CzyjForm form) { form.setClrId(SecurityUtils.getUserId()); mjyService.czyj(form); @@ -184,7 +184,7 @@ public class MjyController extends BaseController */ @PostMapping("/plczrq") @RequiresPermissions("business:resource:mjy:czrq") - public AjaxResult plczrq(@RequestBody MjyPlczrqForm form) + public AjaxResult plczrq(@RequestBody PlczrqForm form) { form.setClrId(SecurityUtils.getUserId()); mjyService.plczrq(form); @@ -196,7 +196,7 @@ public class MjyController extends BaseController */ @PostMapping("/czrq") @RequiresPermissions("business:resource:mjy:czrq") - public AjaxResult czrq(@RequestBody MjyCzrqForm form) + public AjaxResult czrq(@RequestBody CzrqForm form) { form.setClrId(SecurityUtils.getUserId()); mjyService.czrq(form); @@ -209,7 +209,7 @@ public class MjyController extends BaseController */ @PostMapping("ysff") @RequiresPermissions("business:resource:mjy:ysff") - public AjaxResult ysff(@RequestBody MjyYsffForm form) + public AjaxResult ysff(@RequestBody YsffForm form) { form.setFfrId(SecurityUtils.getUserId()); mjyService.ysff(form); @@ -222,7 +222,7 @@ public class MjyController extends BaseController */ @PostMapping("ff") @RequiresPermissions("business:resource:mjy:ff") - public AjaxResult ff(@RequestBody MjyFfForm form) + public AjaxResult ff(@RequestBody FfForm form) { mjyService.ff(form); return AjaxResult.success("操作成功"); @@ -234,7 +234,7 @@ public class MjyController extends BaseController */ @PostMapping("plff") @RequiresPermissions("business:resource:mjy:ff") - public AjaxResult plff(@RequestBody MjyPlffForm form) + public AjaxResult plff(@RequestBody PlffForm form) { mjyService.plff(form); return AjaxResult.success("操作成功"); @@ -247,7 +247,7 @@ public class MjyController extends BaseController */ @PostMapping("bj") @RequiresPermissions("business:resource:mjy:bj") - public AjaxResult bj(@RequestBody MjyBjForm form) + public AjaxResult bj(@RequestBody BjForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.bj(form); @@ -260,7 +260,7 @@ public class MjyController extends BaseController */ @PostMapping("shbj") @RequiresPermissions("business:resource:mjy:shbj") - public AjaxResult shbj(@RequestBody MjyShbjForm form) + public AjaxResult shbj(@RequestBody ShbjForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.shbj(form); @@ -274,7 +274,7 @@ public class MjyController extends BaseController */ @PostMapping("xgkc") @RequiresPermissions("business:resource:mjy:xgkc") - public AjaxResult xgkc(@RequestBody MjyXgkcForm form) + public AjaxResult xgkc(@RequestBody XgkcForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.xgkc(form); @@ -287,12 +287,23 @@ public class MjyController extends BaseController */ @PostMapping("shxgkc") @RequiresPermissions("business:resource:mjy:shxgkc") - public AjaxResult shxgkc(@RequestBody MjyShxgkcForm form) + public AjaxResult shxgkc(@RequestBody ShxgkcForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.shxgkc(form); return AjaxResult.success("操作成功"); } + /** + * 归还 + */ + @PostMapping("gh") + @RequiresPermissions("business:resource:mjy:gh") + public AjaxResult gh(@RequestBody GhForm form) + { + //todo + return AjaxResult.error("todo"); + } + } 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 new file mode 100644 index 0000000..e372cf2 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java @@ -0,0 +1,115 @@ +package com.hxhq.business.controller; + +import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.form.mjy.*; +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; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 麻精药发放记录Controller + * + * @author hxhq + * @date 2025-12-15 + */ +@RestController +@RequestMapping("/business/mjyFfjl") +public class MjyFfjlController extends BaseController +{ + @Autowired + private IMjyFfjlService mjyFfjlService; + + /** + * 查询列表 + */ + @GetMapping("/list") + @RequiresPermissions("business:resource:mjy:ffjllist") + public TableDataInfo list(FfjlSearchForm form) + { + startPage(); + List list = mjyFfjlService.queryList(form); + return getDataTable(list); + } + + /** + * 解档 + */ + @PostMapping("/jd") + @RequiresPermissions("business:resource:mjy:ffjljd") + public AjaxResult jd(@RequestBody FfjlJdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.jd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 批量归档 + */ + @PostMapping("/plgd") + @RequiresPermissions("business:resource:mjy:ffjlgd") + public AjaxResult plgd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.plgd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归档 + */ + @PostMapping("/gd") + @RequiresPermissions("business:resource:mjy:ffjlgd") + public AjaxResult gd(@RequestBody FfjlGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.gd(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 批量锁定 + */ + @PostMapping("/plsd") + @RequiresPermissions("business:resource:mjy:ffjlsd") + public AjaxResult plsd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.plsd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 锁定 + */ + @PostMapping("/sd") + @RequiresPermissions("business:resource:mjy:ffjlsd") + public AjaxResult sd(@RequestBody FfjlSdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.sd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 解锁 + */ + @PostMapping("/js") + @RequiresPermissions("business:resource:mjy:ffjljs") + public AjaxResult js(@RequestBody FfjlJsForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyFfjlService.js(form); + return AjaxResult.success("操作成功"); + } + +} 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 b12494e..ad35c06 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 @@ -18,10 +18,10 @@ public class GyzjFfjl extends MpBaseEntity private static final long serialVersionUID = 1L; /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ - private Long jlzt; + private Integer jlzt; /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ - private Long jyzt; + private Integer jyzt; /** 麻精药id */ private Long mjyId; @@ -140,6 +140,39 @@ public class GyzjFfjl extends MpBaseEntity /** 归档申请人id */ private Long gdsqrId; + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 暂存柜id */ + private Long zcgId; + + public String getSyl() { + return syl; + } + + public void setSyl(String syl) { + this.syl = syl; + } + + public String getSyldw() { + return syldw; + } + + public void setSyldw(String syldw) { + this.syldw = syldw; + } + + public Long getZcgId() { + return zcgId; + } + + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; + } + public String getLqr1Mc() { return lqr1Mc; } @@ -236,26 +269,22 @@ public class GyzjFfjl extends MpBaseEntity this.jsr2Id = jsr2Id; } - public void setJlzt(Long jlzt) - { - this.jlzt = jlzt; - } - - public Long getJlzt() - { + public Integer getJlzt() { return jlzt; } - public void setJyzt(Long jyzt) - { - this.jyzt = jyzt; + public void setJlzt(Integer jlzt) { + this.jlzt = jlzt; } - public Long getJyzt() - { + public Integer getJyzt() { return jyzt; } + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; + } + public void setMjyId(Long mjyId) { this.mjyId = mjyId; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java index 5b4459b..d4d575a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java @@ -18,106 +18,123 @@ public class GyzjTz extends MpBaseEntity /** 给药制剂id */ private Long gyzjId; - /** 使用人id */ - private Long syrId; + /** 领取人名称 */ + private String lqrMc; - /** 领取人id */ - private Long lqrId; + /** 归还人名称 */ + private String ghrMc; - /** 发放人id */ - private Long ffrId; + /** 发放人名称 */ + private String ffrMc; - /** 归还人id */ - private Long ghrId; + /** 接收人名称 */ + private String jsrMc; - /** 接收人id */ - private Long jsrId; + /** 操作量 */ + private String czl; - /** 操作类型 */ - private String czlx; + /** 操作量单位 */ + private String czldw; - /** 操作量 */ - private String cznr; + /** 签名意义 */ + private String qmyy; + + /** 签名人名称 */ + private String qmrMc; + /** 签名人id */ + private String qmrId; - public void setGyzjId(Long gyzjId) - { + /** 备注 */ + private String remark; + + public Long getGyzjId() { + return gyzjId; + } + + public void setGyzjId(Long gyzjId) { this.gyzjId = gyzjId; } - public Long getGyzjId() - { - return gyzjId; + public String getLqrMc() { + return lqrMc; } - public void setSyrId(Long syrId) - { - this.syrId = syrId; + public void setLqrMc(String lqrMc) { + this.lqrMc = lqrMc; } - public Long getSyrId() - { - return syrId; + public String getGhrMc() { + return ghrMc; } - public void setLqrId(Long lqrId) - { - this.lqrId = lqrId; + public void setGhrMc(String ghrMc) { + this.ghrMc = ghrMc; } - public Long getLqrId() - { - return lqrId; + public String getFfrMc() { + return ffrMc; } - public void setFfrId(Long ffrId) - { - this.ffrId = ffrId; + public void setFfrMc(String ffrMc) { + this.ffrMc = ffrMc; } - public Long getFfrId() - { - return ffrId; + public String getJsrMc() { + return jsrMc; } - public void setGhrId(Long ghrId) - { - this.ghrId = ghrId; + public void setJsrMc(String jsrMc) { + this.jsrMc = jsrMc; } - public Long getGhrId() - { - return ghrId; + public String getCzl() { + return czl; } - public void setJsrId(Long jsrId) - { - this.jsrId = jsrId; + public void setCzl(String czl) { + this.czl = czl; } - public Long getJsrId() - { - return jsrId; + public String getCzldw() { + return czldw; } - public void setCzlx(String czlx) - { - this.czlx = czlx; + public void setCzldw(String czldw) { + this.czldw = czldw; } - public String getCzlx() - { - return czlx; + public String getQmyy() { + return qmyy; } - public void setCznr(String cznr) - { - this.cznr = cznr; + public void setQmyy(String qmyy) { + this.qmyy = qmyy; } - public String getCznr() - { - return cznr; + public String getQmrMc() { + return qmrMc; } + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; + } + + public String getQmrId() { + return qmrId; + } + + public void setQmrId(String qmrId) { + this.qmrId = qmrId; + } + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } } 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 66e6bd2..657a7e9 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 @@ -79,8 +79,8 @@ public class Mjy extends MpBaseEntity /** 表单id */ private Long bdId; - /** 项目id */ - private Long xmId; + /** 目的id */ + private Long mdId; /** 名称编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) @@ -185,8 +185,16 @@ public class Mjy extends MpBaseEntity /** 发放备注 */ private String ffbz; - /** 发放项目id */ - private Long ffxmId; + /** 发放目的ids */ + private String mdIds; + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } public Date getFfrq() { return ffrq; @@ -309,12 +317,12 @@ public class Mjy extends MpBaseEntity this.ffbz = ffbz; } - public Long getFfxmId() { - return ffxmId; + public Long getMdId() { + return mdId; } - public void setFfxmId(Long ffxmId) { - this.ffxmId = ffxmId; + public void setMdId(Long mdId) { + this.mdId = mdId; } public Long getBjrId() { @@ -477,13 +485,7 @@ public class Mjy extends MpBaseEntity this.bdId = bdId; } - public Long getXmId() { - return xmId; - } - public void setXmId(Long xmId) { - this.xmId = xmId; - } public String getMcbj() { return mcbj; 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 bcf3a11..93b610e 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 @@ -18,10 +18,10 @@ public class MjyFfjl extends MpBaseEntity private static final long serialVersionUID = 1L; /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ - private Long jlzt; + private Integer jlzt; /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ - private Long jyzt; + private Integer jyzt; /** 麻精药id */ private Long mjyId; @@ -94,8 +94,8 @@ public class MjyFfjl extends MpBaseEntity /** 发放备注 */ private String ffbz; - /** 项目id */ - private Long xmId; + /** 目的ids */ + private String mdIds; /** 归还转移条件 */ private String ghzytj; @@ -140,12 +140,45 @@ public class MjyFfjl extends MpBaseEntity /** 归档申请人id */ private Long gdsqrId; - public Long getXmId() { - return xmId; + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 暂存柜id */ + private Long zcgId; + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getSyl() { + return syl; + } + + public void setSyl(String syl) { + this.syl = syl; + } + + public String getSyldw() { + return syldw; + } + + public void setSyldw(String syldw) { + this.syldw = syldw; + } + + public Long getZcgId() { + return zcgId; } - public void setXmId(Long xmId) { - this.xmId = xmId; + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; } public String getLqr1Mc() { @@ -244,22 +277,22 @@ public class MjyFfjl extends MpBaseEntity this.jsr2Id = jsr2Id; } - public void setJlzt(Long jlzt) + public void setJlzt(Integer jlzt) { this.jlzt = jlzt; } - public Long getJlzt() + public Integer getJlzt() { return jlzt; } - public void setJyzt(Long jyzt) + public void setJyzt(Integer jyzt) { this.jyzt = jyzt; } - public Long getJyzt() + public Integer getJyzt() { return jyzt; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java new file mode 100644 index 0000000..cc9ee1b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java @@ -0,0 +1,254 @@ +package com.hxhq.business.dto.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class MjyFfjlListDto { + /** id */ + private Long id; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 发放转移条件 */ + private String ffzytj; + + /** 发放日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ffrq; + + /** 归还日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ghrq; + + /** 出库量 */ + private String ckl; + + /** 出库量单位 */ + private String ckldw; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 暂存柜名称 */ + private String zcgMc; + + /** 目的名称 */ + private String mdMc; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Long jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Long jyzt; + + public String getMdMc() { + return mdMc; + } + + public void setMdMc(String mdMc) { + this.mdMc = mdMc; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public Date getGhrq() { + return ghrq; + } + + public void setGhrq(Date ghrq) { + this.ghrq = ghrq; + } + + public String getCkl() { + return ckl; + } + + public void setCkl(String ckl) { + this.ckl = ckl; + } + + public String getCkldw() { + return ckldw; + } + + public void setCkldw(String ckldw) { + this.ckldw = ckldw; + } + + public String getRkl() { + return rkl; + } + + public void setRkl(String rkl) { + this.rkl = rkl; + } + + public String getRkldw() { + return rkldw; + } + + public void setRkldw(String rkldw) { + this.rkldw = rkldw; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public String getLqr1Mc() { + return lqr1Mc; + } + + public void setLqr1Mc(String lqr1Mc) { + this.lqr1Mc = lqr1Mc; + } + + public String getLqr2Mc() { + return lqr2Mc; + } + + public void setLqr2Mc(String lqr2Mc) { + this.lqr2Mc = lqr2Mc; + } + + public String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + public String getSyl() { + return syl; + } + + public void setSyl(String syl) { + this.syl = syl; + } + + public String getSyldw() { + return syldw; + } + + public void setSyldw(String syldw) { + this.syldw = syldw; + } + + public String getZcgMc() { + return zcgMc; + } + + public void setZcgMc(String zcgMc) { + this.zcgMc = zcgMc; + } + + public Long getJlzt() { + return jlzt; + } + + public void setJlzt(Long jlzt) { + this.jlzt = jlzt; + } + + public Long getJyzt() { + return jyzt; + } + + public void setJyzt(Long jyzt) { + this.jyzt = jyzt; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java index bcd6f04..cda7e31 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java @@ -91,8 +91,8 @@ public class MjyListDto { /** 发放备注 */ private String ffbz; - /** 发放项目名称*/ - private String ffxmMc; + /** 目的名称*/ + private String mdMc; public String getCkl() { return ckl; @@ -174,12 +174,12 @@ public class MjyListDto { this.ffbz = ffbz; } - public String getFfxmMc() { - return ffxmMc; + public String getMdMc() { + return mdMc; } - public void setFfxmMc(String ffxmMc) { - this.ffxmMc = ffxmMc; + public void setMdMc(String mdMc) { + this.mdMc = mdMc; } public Integer getRqzt() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java new file mode 100644 index 0000000..1765b39 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java @@ -0,0 +1,164 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.common.core.annotation.Excel; + +import java.util.Date; + +/** + * @author 15881 + */ +public class BjForm { + + /** 麻精药id */ + private Long id; + + /** 名称编辑 */ + @Excel(name = "名称") + private String mc; + + /** 浓度编辑 */ + @Excel(name = "浓度") + private String nd; + + /** 浓度单位编辑 */ + @Excel(name = "浓度单位") + private String nddw; + + /** 库存编辑 */ + @Excel(name = "库存") + private String kc; + + /** 库存单位编辑 */ + @Excel(name = "库存单位") + private String kcdw; + + /** 失效日期编辑 */ + @Excel(name = "失效日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxrq; + + /** 存储条件编辑 */ + @Excel(name = "存储条件") + private String cctj; + + /** 存储位置编辑 */ + @Excel(name = "存储位置") + private String ccwz; + + /** 编辑备注 */ + private String bjbz; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 项目id */ + private Long xmId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public Date getSxrq() { + return sxrq; + } + + public void setSxrq(Date sxrq) { + this.sxrq = sxrq; + } + + public String getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getCcwz() { + return ccwz; + } + + public void setCcwz(String ccwz) { + this.ccwz = ccwz; + } + + public String getBjbz() { + return bjbz; + } + + public void setBjbz(String bjbz) { + this.bjbz = bjbz; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public Long getXmId() { + return xmId; + } + + public void setXmId(Long xmId) { + this.xmId = xmId; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzrqForm.java new file mode 100644 index 0000000..f54417f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzrqForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class CzrqForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzyjForm.java new file mode 100644 index 0000000..f8f477b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzyjForm.java @@ -0,0 +1,117 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class CzyjForm { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置量 */ + private String czl; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public String getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java new file mode 100644 index 0000000..5f6979d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java @@ -0,0 +1,161 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 目的ids */ + private String mdIds; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlGdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlGdForm.java new file mode 100644 index 0000000..9910221 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlGdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfjlGdForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJdForm.java new file mode 100644 index 0000000..4dbcafe --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJdForm.java @@ -0,0 +1,52 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfjlJdForm { + + /** 发放记录id */ + private Long id; + + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJsForm.java new file mode 100644 index 0000000..33985eb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJsForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfjlJsForm { + + /** 发放记录id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSdForm.java new file mode 100644 index 0000000..88f4d72 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfjlSdForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java new file mode 100644 index 0000000..a9eed32 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java @@ -0,0 +1,106 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class FfjlSearchForm { + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 入库日期开始 */ + private String startDateRk; + + /** 入库日期结束 */ + private String endDateRk; + + /** 出库日期开始 */ + private String startDateCk; + + /** 出库日期结束 */ + private String endDateCk; + + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + /** 目的id */ + private Long mdId; + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getStartDateRk() { + return startDateRk; + } + + public void setStartDateRk(String startDateRk) { + this.startDateRk = startDateRk; + } + + public String getEndDateRk() { + return endDateRk; + } + + public void setEndDateRk(String endDateRk) { + this.endDateRk = endDateRk; + } + + public String getStartDateCk() { + return startDateCk; + } + + public void setStartDateCk(String startDateCk) { + this.startDateCk = startDateCk; + } + + public String getEndDateCk() { + return endDateCk; + } + + public void setEndDateCk(String endDateCk) { + this.endDateCk = endDateCk; + } + + public Integer getJlzt() { + return jlzt; + } + + public void setJlzt(Integer jlzt) { + this.jlzt = jlzt; + } + + public Integer getJyzt() { + return jyzt; + } + + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; + } + + public Long getMdId() { + return mdId; + } + + public void setMdId(Long mdId) { + this.mdId = mdId; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GdForm.java new file mode 100644 index 0000000..0001651 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class GdForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java new file mode 100644 index 0000000..b529b56 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class GhForm { + + /** 发放记录id */ + private Long id; + + /** 发放记录ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JdForm.java new file mode 100644 index 0000000..bb70165 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JdForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class JdForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JsForm.java new file mode 100644 index 0000000..7643f2b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JsForm.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class JsForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java deleted file mode 100644 index 4865eaf..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.hxhq.business.form.mjy; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hxhq.common.core.annotation.Excel; - -import java.util.Date; - -/** - * @author 15881 - */ -public class MjyBjForm { - - /** 麻精药id */ - private Long id; - - /** 名称编辑 */ - @Excel(name = "名称") - private String mc; - - /** 浓度编辑 */ - @Excel(name = "浓度") - private String nd; - - /** 浓度单位编辑 */ - @Excel(name = "浓度单位") - private String nddw; - - /** 库存编辑 */ - @Excel(name = "库存") - private String kc; - - /** 库存单位编辑 */ - @Excel(name = "库存单位") - private String kcdw; - - /** 失效日期编辑 */ - @Excel(name = "失效日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date sxrq; - - /** 存储条件编辑 */ - @Excel(name = "存储条件") - private String cctj; - - /** 存储位置编辑 */ - @Excel(name = "存储位置") - private String ccwz; - - /** 编辑备注 */ - private String bjbz; - - /** 签名人id */ - private Long qmrId; - - /** 签名人密码 */ - private String qmrmm; - - /** 项目id */ - private Long xmId; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getMc() { - return mc; - } - - public void setMc(String mc) { - this.mc = mc; - } - - public String getNd() { - return nd; - } - - public void setNd(String nd) { - this.nd = nd; - } - - public String getNddw() { - return nddw; - } - - public void setNddw(String nddw) { - this.nddw = nddw; - } - - public String getKc() { - return kc; - } - - public void setKc(String kc) { - this.kc = kc; - } - - public String getKcdw() { - return kcdw; - } - - public void setKcdw(String kcdw) { - this.kcdw = kcdw; - } - - public Date getSxrq() { - return sxrq; - } - - public void setSxrq(Date sxrq) { - this.sxrq = sxrq; - } - - public String getCctj() { - return cctj; - } - - public void setCctj(String cctj) { - this.cctj = cctj; - } - - public String getCcwz() { - return ccwz; - } - - public void setCcwz(String ccwz) { - this.ccwz = ccwz; - } - - public String getBjbz() { - return bjbz; - } - - public void setBjbz(String bjbz) { - this.bjbz = bjbz; - } - - public Long getQmrId() { - return qmrId; - } - - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; - } - - public String getQmrmm() { - return qmrmm; - } - - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; - } - - public Long getXmId() { - return xmId; - } - - public void setXmId(Long xmId) { - this.xmId = xmId; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java deleted file mode 100644 index eb36805..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java +++ /dev/null @@ -1,106 +0,0 @@ -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 deleted file mode 100644 index 7aab734..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hxhq.business.form.mjy; - -/** - * @author 15881 - */ -public class MjyCzyjForm { - - /** 麻精药id */ - private Long id; - - /** 处置原因 */ - private String czyy; - - /** 处置方式 */ - private String czfs; - - /** 处置量 */ - private String czl; - - /** 处置人id */ - private Long clrId; - - /** 处置人密码 */ - private String clrmm; - - /** 复核人id */ - private Long fhrId; - - /** 复核人密码 */ - private String fhrmm; - - /** 监督人id */ - private Long jdrId; - - /** 监督人密码 */ - private String jdrmm; - - public String getCzl() { - return czl; - } - - public void setCzl(String czl) { - this.czl = czl; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCzyy() { - return czyy; - } - - public void setCzyy(String czyy) { - this.czyy = czyy; - } - - public String getCzfs() { - return czfs; - } - - public void setCzfs(String czfs) { - this.czfs = czfs; - } - - public Long getClrId() { - return clrId; - } - - public void setClrId(Long clrId) { - this.clrId = clrId; - } - - public String getClrmm() { - return clrmm; - } - - public void setClrmm(String clrmm) { - this.clrmm = clrmm; - } - - public Long getFhrId() { - return fhrId; - } - - public void setFhrId(Long fhrId) { - this.fhrId = fhrId; - } - - public String getFhrmm() { - return fhrmm; - } - - public void setFhrmm(String fhrmm) { - this.fhrmm = fhrmm; - } - - public Long getJdrId() { - return jdrId; - } - - public void setJdrId(Long jdrId) { - this.jdrId = jdrId; - } - - public String getJdrmm() { - return jdrmm; - } - - public void setJdrmm(String jdrmm) { - this.jdrmm = jdrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java deleted file mode 100644 index fe6b98a..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java +++ /dev/null @@ -1,161 +0,0 @@ -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 deleted file mode 100644 index 486fa0f..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index efe9b66..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index e614661..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java +++ /dev/null @@ -1,51 +0,0 @@ -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/MjyPlczrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqForm.java deleted file mode 100644 index 834e43f..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqForm.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.hxhq.business.form.mjy; - -import java.util.List; - -/** - * @author 15881 - */ -public class MjyPlczrqForm { - - /** 麻精药列表 */ - private List list; - - /** 麻精药ids */ - private Long[] ids; - - /** 处置人id */ - private Long clrId; - - /** 处置人密码 */ - private String clrmm; - - /** 复核人id */ - private Long fhrId; - - /** 复核人密码 */ - private String fhrmm; - - /** 监督人id */ - private Long jdrId; - - /** 监督人密码 */ - private String jdrmm; - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } - - public Long[] getIds() { - return ids; - } - - public void setIds(Long[] ids) { - this.ids = ids; - } - - - - public Long getClrId() { - return clrId; - } - - public void setClrId(Long clrId) { - this.clrId = clrId; - } - - public String getClrmm() { - return clrmm; - } - - public void setClrmm(String clrmm) { - this.clrmm = clrmm; - } - - public Long getFhrId() { - return fhrId; - } - - public void setFhrId(Long fhrId) { - this.fhrId = fhrId; - } - - public String getFhrmm() { - return fhrmm; - } - - public void setFhrmm(String fhrmm) { - this.fhrmm = fhrmm; - } - - public Long getJdrId() { - return jdrId; - } - - public void setJdrId(Long jdrId) { - this.jdrId = jdrId; - } - - public String getJdrmm() { - return jdrmm; - } - - public void setJdrmm(String jdrmm) { - this.jdrmm = jdrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqItem.java deleted file mode 100644 index 80589f8..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqItem.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hxhq.business.form.mjy; - -/** - * @author 15881 - */ -public class MjyPlczrqItem { - - /** 麻精药id */ - private Long id; - - /** 处置原因 */ - private String czyy; - - /** 处置方式 */ - private String czfs; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCzyy() { - return czyy; - } - - public void setCzyy(String czyy) { - this.czyy = czyy; - } - - public String getCzfs() { - return czfs; - } - - public void setCzfs(String czfs) { - this.czfs = czfs; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjForm.java deleted file mode 100644 index c98cb19..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjForm.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.hxhq.business.form.mjy; - -import java.util.List; - -/** - * @author 15881 - */ -public class MjyPlczyjForm { - - /** 麻精药列表 */ - private List list; - - /** 麻精药ids */ - private Long[] ids; - - /** 处置人id */ - private Long clrId; - - /** 处置人密码 */ - private String clrmm; - - /** 复核人id */ - private Long fhrId; - - /** 复核人密码 */ - private String fhrmm; - - /** 监督人id */ - private Long jdrId; - - /** 监督人密码 */ - private String jdrmm; - - public Long[] getIds() { - return ids; - } - - public void setIds(Long[] ids) { - this.ids = ids; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } - - public Long getClrId() { - return clrId; - } - - public void setClrId(Long clrId) { - this.clrId = clrId; - } - - public String getClrmm() { - return clrmm; - } - - public void setClrmm(String clrmm) { - this.clrmm = clrmm; - } - - public Long getFhrId() { - return fhrId; - } - - public void setFhrId(Long fhrId) { - this.fhrId = fhrId; - } - - public String getFhrmm() { - return fhrmm; - } - - public void setFhrmm(String fhrmm) { - this.fhrmm = fhrmm; - } - - public Long getJdrId() { - return jdrId; - } - - public void setJdrId(Long jdrId) { - this.jdrId = jdrId; - } - - public String getJdrmm() { - return jdrmm; - } - - public void setJdrmm(String jdrmm) { - this.jdrmm = jdrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjItem.java deleted file mode 100644 index b1bdbf6..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjItem.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hxhq.business.form.mjy; - -/** - * @author 15881 - */ -public class MjyPlczyjItem { - - /** 麻精药id */ - private Long id; - - /** 处置原因 */ - private String czyy; - - /** 处置方式 */ - private String czfs; - - /** 处置量 */ - private String czl; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCzyy() { - return czyy; - } - - public void setCzyy(String czyy) { - this.czyy = czyy; - } - - public String getCzfs() { - return czfs; - } - - public void setCzfs(String czfs) { - this.czfs = czfs; - } - - public String getCzl() { - return czl; - } - - public void setCzl(String czl) { - this.czl = czl; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java deleted file mode 100644 index 9a99e64..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java +++ /dev/null @@ -1,119 +0,0 @@ -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/MjyPlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItem.java deleted file mode 100644 index 7e94daa..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItem.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hxhq.business.form.mjy; - -/** - * @author 15881 - */ -public class MjyPlffItem { - - /** 麻精药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 deleted file mode 100644 index 595a05a..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java +++ /dev/null @@ -1,62 +0,0 @@ -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/MjySearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySearchForm.java deleted file mode 100644 index 681089e..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySearchForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hxhq.business.form.mjy; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - -/** - * @author 15881 - */ -public class MjySearchForm { - - /** 名称 */ - private String mc; - - /** 编号 */ - private String bh; - - /** 失效日期开始 */ - private String startDate; - - /** 失效日期结束 */ - private String endDate; - - /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ - private Integer zjzt; - - /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ - private Integer jyzt; - - public String getMc() { - return mc; - } - - public void setMc(String mc) { - this.mc = mc; - } - - public String getBh() { - return bh; - } - - public void setBh(String bh) { - this.bh = bh; - } - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public Integer getZjzt() { - return zjzt; - } - - public void setZjzt(Integer zjzt) { - this.zjzt = zjzt; - } - - public Integer getJyzt() { - return jyzt; - } - - public void setJyzt(Integer jyzt) { - this.jyzt = jyzt; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java deleted file mode 100644 index 0a239cc..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java +++ /dev/null @@ -1,66 +0,0 @@ -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 remark; - - /** 签名人id */ - private Long qmrId; - - /** 签名人密码 */ - private String qmrmm; - - /** 签名意义 */ - private String qmyy; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Long getQmrId() { - return qmrId; - } - - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; - } - - public String getQmrmm() { - return qmrmm; - } - - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; - } - - public String getQmyy() { - return qmyy; - } - - public void setQmyy(String qmyy) { - this.qmyy = qmyy; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java deleted file mode 100644 index abd9dca..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hxhq.business.form.mjy; - -/** - * @author 15881 - */ -public class MjyShxgkcForm { - - /** 麻精药id */ - private Long id; - - /** 库存编辑 */ - private String kc; - - /** 库存单位 */ - private String kcdw; - - /** 备注 */ - private String remark; - - /** 签名人id */ - private Long qmrId; - - /** 签名人密码 */ - private String qmrmm; - - /** 签名意义 */ - private String qmyy; - - public String getQmyy() { - return qmyy; - } - - public void setQmyy(String qmyy) { - this.qmyy = qmyy; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - public String getKc() { - return kc; - } - - public void setKc(String kc) { - this.kc = kc; - } - - public String getKcdw() { - return kcdw; - } - - public void setKcdw(String kcdw) { - this.kcdw = kcdw; - } - - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Long getQmrId() { - return qmrId; - } - - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; - } - - public String getQmrmm() { - return qmrmm; - } - - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java deleted file mode 100644 index 3a5ad72..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hxhq.business.form.mjy; - -import com.hxhq.common.core.annotation.Excel; - -/** - * @author 15881 - */ -public class MjyXgkcForm { - - /** 麻精药id */ - private Long id; - - /** 库存 */ - @Excel(name = "库存") - private String kc;; - - /** 库存单位 */ - @Excel(name = "库存单位") - private String kcdw; - - /** 库存编辑备注 */ - private String kcbjbz; - - /** 签名人id */ - private Long qmrId; - - /** 签名人密码 */ - private String qmrmm; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getKc() { - return kc; - } - - public void setKc(String kc) { - this.kc = kc; - } - - public String getKcdw() { - return kcdw; - } - - public void setKcdw(String kcdw) { - this.kcdw = kcdw; - } - - public String getKcbjbz() { - return kcbjbz; - } - - public void setKcbjbz(String kcbjbz) { - this.kcbjbz = kcbjbz; - } - - public Long getQmrId() { - return qmrId; - } - - public void setQmrId(Long qmrId) { - this.qmrId = qmrId; - } - - public String getQmrmm() { - return qmrmm; - } - - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java deleted file mode 100644 index f5200ae..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java +++ /dev/null @@ -1,117 +0,0 @@ -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/mjy/PlczrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqForm.java new file mode 100644 index 0000000..1481f17 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqForm.java @@ -0,0 +1,99 @@ +package com.hxhq.business.form.mjy; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlczrqForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqItem.java new file mode 100644 index 0000000..2cd69ac --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqItem.java @@ -0,0 +1,40 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class PlczrqItem { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjForm.java new file mode 100644 index 0000000..d824906 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjForm.java @@ -0,0 +1,97 @@ +package com.hxhq.business.form.mjy; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlczyjForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 处置人id */ + private Long clrId; + + /** 处置人密码 */ + private String clrmm; + + /** 复核人id */ + private Long fhrId; + + /** 复核人密码 */ + private String fhrmm; + + /** 监督人id */ + private Long jdrId; + + /** 监督人密码 */ + private String jdrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long getClrId() { + return clrId; + } + + public void setClrId(Long clrId) { + this.clrId = clrId; + } + + public String getClrmm() { + return clrmm; + } + + public void setClrmm(String clrmm) { + this.clrmm = clrmm; + } + + public Long getFhrId() { + return fhrId; + } + + public void setFhrId(Long fhrId) { + this.fhrId = fhrId; + } + + public String getFhrmm() { + return fhrmm; + } + + public void setFhrmm(String fhrmm) { + this.fhrmm = fhrmm; + } + + public Long getJdrId() { + return jdrId; + } + + public void setJdrId(Long jdrId) { + this.jdrId = jdrId; + } + + public String getJdrmm() { + return jdrmm; + } + + public void setJdrmm(String jdrmm) { + this.jdrmm = jdrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjItem.java new file mode 100644 index 0000000..a1de970 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjItem.java @@ -0,0 +1,51 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class PlczyjItem { + + /** 麻精药id */ + private Long id; + + /** 处置原因 */ + private String czyy; + + /** 处置方式 */ + private String czfs; + + /** 处置量 */ + private String czl; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCzyy() { + return czyy; + } + + public void setCzyy(String czyy) { + this.czyy = czyy; + } + + public String getCzfs() { + return czfs; + } + + public void setCzfs(String czfs) { + this.czfs = czfs; + } + + public String getCzl() { + return czl; + } + + public void setCzl(String czl) { + this.czl = czl; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java new file mode 100644 index 0000000..04d1003 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java @@ -0,0 +1,119 @@ +package com.hxhq.business.form.mjy; + +import java.util.List; + +/** + * @author 15881 + */ +public class PlffForm { + + /** 麻精药列表 */ + private List list; + + /** 麻精药ids */ + private Long[] ids; + + /** 领取人1Id */ + private Long lqr1Id; + + /** 领取人2密码 */ + private String lqr2mm; + + /** 领取人2Id */ + private Long lqr2Id; + + /** 领取人1密码 */ + private String lqr1mm; + + /** 发放人1Id */ + private Long ffr1Id; + + /** 发放人1密码 */ + private String ffr1mm; + + /** 发放人2Id */ + private Long ffr2Id; + + /** 发放人2密码 */ + private String ffr2mm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public String getFfr1mm() { + return ffr1mm; + } + + public void setFfr1mm(String ffr1mm) { + this.ffr1mm = ffr1mm; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getFfr2mm() { + return ffr2mm; + } + + public void setFfr2mm(String ffr2mm) { + this.ffr2mm = ffr2mm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffItem.java new file mode 100644 index 0000000..c752802 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffItem.java @@ -0,0 +1,75 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class PlffItem { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 转移条件 */ + private String zytj; + + /** 目的ids */ + private String mdIds; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + public String getMdIds() { + return mdIds; + } + + public void setMdIds(String mdIds) { + this.mdIds = mdIds; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SdForm.java new file mode 100644 index 0000000..1f4c2bf --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SdForm.java @@ -0,0 +1,62 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class SdForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java new file mode 100644 index 0000000..cf10a83 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java @@ -0,0 +1,77 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class SearchForm { + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 失效日期开始 */ + private String startDate; + + /** 失效日期结束 */ + private String endDate; + + /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ + private Integer zjzt; + + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public Integer getZjzt() { + return zjzt; + } + + public void setZjzt(Integer zjzt) { + this.zjzt = zjzt; + } + + public Integer getJyzt() { + return jyzt; + } + + public void setJyzt(Integer jyzt) { + this.jyzt = jyzt; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java new file mode 100644 index 0000000..cf25a17 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java @@ -0,0 +1,66 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class ShbjForm { + + /** 麻精药id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private String qmyy; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java new file mode 100644 index 0000000..847ce21 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java @@ -0,0 +1,86 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class ShxgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存编辑 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名意义 */ + private String qmyy; + + public String getQmyy() { + return qmyy; + } + + public void setQmyy(String qmyy) { + this.qmyy = qmyy; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/XgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/XgkcForm.java new file mode 100644 index 0000000..6d1eebd --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/XgkcForm.java @@ -0,0 +1,77 @@ +package com.hxhq.business.form.mjy; + +import com.hxhq.common.core.annotation.Excel; + +/** + * @author 15881 + */ +public class XgkcForm { + + /** 麻精药id */ + private Long id; + + /** 库存 */ + @Excel(name = "库存") + private String kc;; + + /** 库存单位 */ + @Excel(name = "库存单位") + private String kcdw; + + /** 库存编辑备注 */ + private String kcbjbz; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getKc() { + return kc; + } + + public void setKc(String kc) { + this.kc = kc; + } + + public String getKcdw() { + return kcdw; + } + + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public String getKcbjbz() { + return kcbjbz; + } + + public void setKcbjbz(String kcbjbz) { + this.kcbjbz = kcbjbz; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/YsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/YsffForm.java new file mode 100644 index 0000000..7073e77 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/YsffForm.java @@ -0,0 +1,117 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class YsffForm { + + /** 麻精药id */ + private Long id; + + /** 麻精药ids */ + private Long[] ids; + + /** 暂存柜id */ + private Long zcgId; + + /** 备注 */ + private String remark; + + /** 钥匙1领取人ID */ + private Long lqr1Id; + + /** 钥匙2领取人ID */ + private Long lqr2Id; + + /** 钥匙1领取人密码 */ + private String lqr1mm; + + /** 钥匙2领取人密码 */ + private String lqr2mm; + + /** 发放人 */ + private Long ffrId; + + /** 发放人密码 */ + private String ffrmm; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long[] getIds() { + return ids; + } + + public void setIds(Long[] ids) { + this.ids = ids; + } + + public Long getZcgId() { + return zcgId; + } + + public void setZcgId(Long zcgId) { + this.zcgId = zcgId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public String getLqr1mm() { + return lqr1mm; + } + + public void setLqr1mm(String lqr1mm) { + this.lqr1mm = lqr1mm; + } + + public String getLqr2mm() { + return lqr2mm; + } + + public void setLqr2mm(String lqr2mm) { + this.lqr2mm = lqr2mm; + } + + public Long getFfrId() { + return ffrId; + } + + public void setFfrId(Long ffrId) { + this.ffrId = ffrId; + } + + public String getFfrmm() { + return ffrmm; + } + + public void setFfrmm(String ffrmm) { + this.ffrmm = ffrmm; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java index 8dc207d..a613f97 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java @@ -1,7 +1,15 @@ package com.hxhq.business.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.hxhq.business.domain.Mjy; import com.hxhq.business.domain.MjyFfjl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.dto.mjy.MjyListDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * 麻精药-发放记录Mapper接口 * @@ -10,5 +18,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface MjyFfjlMapper extends BaseMapper { - + /** + * 查询列表 + * @param queryWrapper + * @return + */ + List queryList(@Param("ew") Wrapper queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java index 1cf7676..70053d8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java @@ -18,14 +18,14 @@ import java.util.List; public interface MjyMapper extends BaseMapper { /** - * 查询暂存柜列表 + * 查询列表 * @param queryWrapper * @return */ List queryList(@Param("ew") Wrapper queryWrapper); /** - * 查询暂存柜 + * 查询详情 * @param id * @return */ 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 bfa8fd2..486bc2e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java @@ -3,6 +3,9 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.MjyFfjl; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.form.mjy.*; +import org.springframework.web.bind.annotation.RequestBody; /** * 麻精药-发放记录Service接口 @@ -15,9 +18,51 @@ public interface IMjyFfjlService extends IService /** * 查询麻精药-发放记录列表 * - * @param mjyFfjl 麻精药-发放记录 + * @param form 麻精药-发放记录 * @return 麻精药-发放记录集合 */ - public List queryList(MjyFfjl mjyFfjl); + public List queryList(FfjlSearchForm form); + /** + * 解档 + * + * @param form + */ + public void jd(@RequestBody FfjlJdForm form); + + /** + * 批量归档 + * + * @param form + */ + public void plgd(@RequestBody FfjlGdForm form); + + /** + * 归档 + * + * @param form + */ + public void gd(@RequestBody FfjlGdForm form); + + + /** + * 批量锁定 + * + * @param form + */ + public void plsd(@RequestBody FfjlSdForm form); + + /** + * 锁定 + * + * @param form + */ + public void sd(@RequestBody FfjlSdForm form); + + /** + * 解锁 + * + * @param form + */ + public void js(@RequestBody FfjlJsForm form); } 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 beeeb99..a05a228 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 @@ -24,7 +24,7 @@ public interface IMjyService extends IService * @param form 麻精药 * @return 麻精药集合 */ - public List queryList(MjySearchForm form); + public List queryList(SearchForm form); /** * 查询麻精药 @@ -39,21 +39,21 @@ public interface IMjyService extends IService * * @param form */ - public void jd(@RequestBody MjyJdForm form); + public void jd(@RequestBody JdForm form); /** * 批量归档 * * @param form */ - public void plgd(@RequestBody MjyGdForm form); + public void plgd(@RequestBody GdForm form); /** * 归档 * * @param form */ - public void gd(@RequestBody MjyGdForm form); + public void gd(@RequestBody GdForm form); /** @@ -61,49 +61,49 @@ public interface IMjyService extends IService * * @param form */ - public void plsd(@RequestBody MjySdForm form); + public void plsd(@RequestBody SdForm form); /** * 锁定 * * @param form */ - public void sd(@RequestBody MjySdForm form); + public void sd(@RequestBody SdForm form); /** * 解锁 * * @param form */ - public void js(@RequestBody MjyJsForm form); + public void js(@RequestBody JsForm form); /** * 批量处置药剂 * * @param form */ - public void plczyj(@RequestBody MjyPlczyjForm form); + public void plczyj(@RequestBody PlczyjForm form); /** * 处置药剂 * * @param form */ - public void czyj(@RequestBody MjyCzyjForm form); + public void czyj(@RequestBody CzyjForm form); /** * 批量处置容器 * * @param form */ - public void plczrq(@RequestBody MjyPlczrqForm form); + public void plczrq(@RequestBody PlczrqForm form); /** * 处置容器 * * @param form */ - public void czrq(@RequestBody MjyCzrqForm form); + public void czrq(@RequestBody CzrqForm form); /** @@ -111,7 +111,7 @@ public interface IMjyService extends IService * * @param form */ - public void ysff(@RequestBody MjyYsffForm form); + public void ysff(@RequestBody YsffForm form); /** @@ -119,7 +119,7 @@ public interface IMjyService extends IService * * @param form */ - public void ff(@RequestBody MjyFfForm form); + public void ff(@RequestBody FfForm form); /** @@ -127,34 +127,34 @@ public interface IMjyService extends IService * * @param form */ - public void plff(@RequestBody MjyPlffForm form); + public void plff(@RequestBody PlffForm form); /** * 编辑 * * @param form */ - public void bj(@RequestBody MjyBjForm form); + public void bj(@RequestBody BjForm form); /** * 审核编辑 * * @param form */ - public void shbj(@RequestBody MjyShbjForm form); + public void shbj(@RequestBody ShbjForm form); /** * 修改库存 * * @param form */ - public void xgkc(@RequestBody MjyXgkcForm form); + public void xgkc(@RequestBody XgkcForm form); /** * 审核修改库存 * * @param form */ - public void shxgkc(@RequestBody MjyShxgkcForm form); + public void shxgkc(@RequestBody ShxgkcForm form); } 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 2d5acec..5c909dc 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 @@ -1,13 +1,29 @@ package com.hxhq.business.service.impl; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.Mjy; +import com.hxhq.business.domain.MjyJcgj; +import com.hxhq.business.dto.mjy.MjyFfjlListDto; +import com.hxhq.business.enums.zykgl.JcgjlxEnum; +import com.hxhq.business.enums.zykgl.JcmcysEnum; +import com.hxhq.business.enums.zykgl.JlztEnum; +import com.hxhq.business.enums.zykgl.JlztEnum; +import com.hxhq.business.form.mjy.*; +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.MjyFfjlMapper; import com.hxhq.business.domain.MjyFfjl; import com.hxhq.business.service.IMjyFfjlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; /** * 麻精药-发放记录Service业务层处理 @@ -18,17 +34,268 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class MjyFfjlServiceImpl extends ServiceImpl implements IMjyFfjlService { + @Autowired + private ISysUserService sysUserService; + /** - * 查询麻精药-发放记录列表 + * 查询列表 * - * @param mjyFfjl 麻精药-发放记录 - * @return 麻精药-发放记录 + * @param form 麻精药发放记录 + * @return 麻精药发放记录 */ @Override - public List queryList(MjyFfjl mjyFfjl) + public List queryList(FfjlSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); - return this.list(queryWrapper); + queryWrapper.eq("t.del_flag", "0"); + if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { + queryWrapper.eq("t.jyzt", form.getJyzt()); + } + if (form.getJlzt() != null && form.getJlzt().intValue() > 0) { + queryWrapper.eq("t.jlzt", form.getJlzt()); + } + if (StringUtils.isNoneBlank(form.getMc())) { + queryWrapper.and(p -> p.like("t.`mc`", form.getMc())); + } + if (StringUtils.isNoneBlank(form.getBh())) { + queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); + } + if (StringUtils.isNoneBlank(form.getStartDateCk())) { + queryWrapper.and(p->p.apply("t.ffrq>={0}", form.getStartDateCk())); + } + if (StringUtils.isNoneBlank(form.getEndDateCk())) { + queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk()); + } + if (StringUtils.isNoneBlank(form.getStartDateRk())) { + queryWrapper.and(p->p.apply("t.rkrq>={0}", form.getStartDateRk())); + } + if (StringUtils.isNoneBlank(form.getEndDateRk())) { + queryWrapper.apply("t.rkrq>={0}", form.getEndDateRk()); + } + if (form.getMdId() != null && form.getMdId().intValue() > 0) { + queryWrapper.and(p->p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + } + queryWrapper.orderByDesc("t.id"); + return baseMapper.queryList(queryWrapper); + } + + /** + * 解档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void jd(@RequestBody FfjlJdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + MjyFfjl mjyFfjlOld = this.getById(form.getId()); + if (mjyFfjlOld == null) { + throw new SecurityException("麻精药发放记录不存在或已删除"); + } + if (!mjyFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) { + throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】未归档，不能解档"); + } + //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作； + mjyFfjlOld.setJlzt(JlztEnum.djd.getValue()); + this.updateById(mjyFfjlOld); +// //稽查轨迹 todo +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：申请解档" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); +// + } + + /** + * 批量归档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plgd(@RequestBody FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + List mjyFfjlList = this.list(queryWrapper); + List mjyJcgjList = new ArrayList<>(); + if (mjyFfjlList.size() > 0) { + for (MjyFfjl mjy : mjyFfjlList) { + if (!mjy.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("麻精药发放记录【" + mjy.getMc() + "】不是锁定状态，不能归档"); + } + } + for (MjyFfjl mjyFfjl : mjyFfjlList) { + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + mjyFfjl.setJlzt(JlztEnum.dgd.getValue()); + +// //region 稽查轨迹 +// MjyJcgj mjyJcgj = new MjyJcgj(); +// mjyJcgj.setMjyId(mjy.getId()); +// mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); +// mjyJcgj.setJcmc("申请归档"); +// mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：申请归档" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgj.setJcnr(jcnr); +// mjyJcgj.setQmrId(SecurityUtils.getUserId()); +// mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); +// mjyJcgjList.add(mjyJcgj); +// //endregion + + } + this.saveOrUpdateBatch(mjyFfjlList); +// mjyJcgjService.saveBatch(mjyJcgjList); + } + } + + /** + * 归档 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gd(@RequestBody FfjlGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + MjyFfjl mjyFfjlOld = this.getById(form.getId()); + if (mjyFfjlOld == null) { + throw new SecurityException("麻精药发放记录不存在或已删除"); + } + if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是锁定状态，不能归档"); + } + //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； + mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue()); + this.updateById(mjyFfjlOld); +// //稽查轨迹 +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：申请归档" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); +// + } + + + /** + * 批量锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void plsd(@RequestBody FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getIds().length < 0) { + throw new SecurityException("参数ids不正确"); + } + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.in("id", form.getIds()); + queryWrapper.eq("jlzt", JlztEnum.wsd.getValue()); + List mjyFfjlList = this.list(queryWrapper); +// List mjyJcgjList = new ArrayList<>(); + if (mjyFfjlList.size() <= 0) { + throw new SecurityException("麻精药发放记录不是未锁定状态，不能锁定"); + } + for (MjyFfjl mjyFfjl : mjyFfjlList) { + //锁定 + mjyFfjl.setJlzt(JlztEnum.ysd.getValue()); + +// //region 稽查轨迹 +// MjyJcgj mjyJcgj = new MjyJcgj(); +// mjyJcgj.setMjyId(mjy.getId()); +// mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); +// mjyJcgj.setJcmc("锁定麻精药发放记录"); +// mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：锁定麻精药发放记录" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgj.setJcnr(jcnr); +// mjyJcgj.setQmrId(SecurityUtils.getUserId()); +// mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); +// mjyJcgjList.add(mjyJcgj); +// //endregion + + } + this.saveOrUpdateBatch(mjyFfjlList); +// mjyJcgjService.saveBatch(mjyJcgjList); + + } + + /** + * 锁定 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void sd(@RequestBody FfjlSdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + MjyFfjl mjyFfjlOld = this.getById(form.getId()); + if (mjyFfjlOld == null) { + throw new SecurityException("麻精药发放记录不存在或已删除"); + } + if (!mjyFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) { + throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能锁定"); + } + mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue()); + this.updateById(mjyFfjlOld); +// //稽查轨迹 +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：锁定麻精药发放记录" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); +// + } + + + /** + * 解锁 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void js(@RequestBody FfjlJsForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + //验证签名人密码 todo + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + MjyFfjl mjyFfjlOld = this.getById(form.getId()); + if (mjyFfjlOld == null) { + throw new SecurityException("麻精药发放记录不存在或已删除"); + } + if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) { + throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是已锁定状态，不能解锁"); + } + //点击解锁，状态更新为入库； + mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue()); + this.updateById(mjyFfjlOld); +// //稽查轨迹 +// String jcnr = "备注：" + form.getRemark() +// + ";签名意义：解锁麻精药发放记录" +// + ";签名人：" + qmr.getNickName(); +// mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); +// } } 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 e9d1541..6d66af3 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 @@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; @@ -56,7 +55,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public List queryList(MjySearchForm form) { + public List queryList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { @@ -77,6 +76,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (StringUtils.isNoneBlank(form.getEndDate())) { queryWrapper.apply("t.sxrq<{0}", form.getEndDate()); } + queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper); } @@ -103,7 +103,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void jd(@RequestBody MjyJdForm form) { + public void jd(@RequestBody JdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -133,7 +133,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plgd(@RequestBody MjyGdForm form) { + public void plgd(@RequestBody GdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getIds().length < 0) { @@ -181,7 +181,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void gd(@RequestBody MjyGdForm form) { + public void gd(@RequestBody GdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -212,7 +212,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plsd(@RequestBody MjySdForm form) { + public void plsd(@RequestBody SdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getIds().length < 0) { @@ -258,7 +258,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void sd(@RequestBody MjySdForm form) { + public void sd(@RequestBody SdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -288,7 +288,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void js(@RequestBody MjyJsForm form) { + public void js(@RequestBody JsForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -318,7 +318,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plczyj(@RequestBody MjyPlczyjForm form) { + public void plczyj(@RequestBody PlczyjForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); if (clr == null) { throw new SecurityException("处理人不存在"); @@ -349,7 +349,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyTzList = new ArrayList<>(); for (Mjy mjy : mjyList) { - List mjyPlffItemFilter = form.getList().stream() + List mjyPlffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); if (mjyPlffItemFilter.size() > 0) { @@ -424,7 +424,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void czyj(@RequestBody MjyCzyjForm form) { + public void czyj(@RequestBody CzyjForm form) { if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -497,7 +497,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plczrq(@RequestBody MjyPlczrqForm form) { + public void plczrq(@RequestBody PlczrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); if (clr == null) { throw new SecurityException("处理人不存在"); @@ -526,7 +526,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new SecurityException("麻精药已经处置过容器了，不能重复操作"); } for (Mjy mjy : mjyList) { - List mjyPlffItemFilter = form.getList().stream() + List mjyPlffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); if (mjyPlffItemFilter.size() > 0) { @@ -576,7 +576,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void czrq(@RequestBody MjyCzrqForm form) { + public void czrq(@RequestBody CzrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); if (clr == null) { throw new SecurityException("处理人不存在"); @@ -629,7 +629,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void ysff(@RequestBody MjyYsffForm form) { + public void ysff(@RequestBody YsffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); if (lqr1 == null) { throw new SecurityException("领取人1不存在"); @@ -709,7 +709,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void ff(@RequestBody MjyFfForm form) { + public void ff(@RequestBody FfForm form) { if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -768,7 +768,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setFfzytj(form.getZytj()); mjyFfjl.setFfrq(now); mjyFfjl.setFfbz(form.getRemark()); - mjyFfjl.setXmId(form.getXmId()); + mjyFfjl.setMdIds(form.getMdIds()); mjyFfjlService.save(mjyFfjl); @@ -779,7 +779,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS String jcnr = "出库量：" + mjyOld.getKc() + ";转移条件：" + form.getZytj() + ";出库毛重：" + form.getCkmz() + mjyOld.getKcdw() - + ";目的：" + form.getXmId() + + ";目的：" + form.getMdIds() + ";备注：" + form.getRemark(); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -809,7 +809,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setFfr2Mc(ffr2.getNickName()); mjyOld.setFfrq(now); mjyOld.setFfbz(form.getRemark()); - mjyOld.setFfxmId(form.getXmId()); + mjyOld.setMdIds(form.getMdIds()); mjyOld.setZjzt(ZjztEnum.yff.getValue()); //endregion @@ -825,7 +825,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plff(@RequestBody MjyPlffForm form) { + public void plff(@RequestBody PlffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); if (lqr1 == null) { throw new SecurityException("领取人1不存在"); @@ -866,10 +866,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (kc.compareTo(BigDecimal.ZERO) <= 0) { throw new SecurityException("麻精药【" + mjy.getMc() + "】库存不足，不能发放"); } - List mjyPlffItemFilter = form.getList().stream() + List plffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); - if (mjyPlffItemFilter.size() > 0) { + if (plffItemFilter.size() > 0) { //region 发放记录 MjyFfjl mjyFfjl = new MjyFfjl(); @@ -885,8 +885,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setCkl(mjy.getKc()); mjyFfjl.setCkldw(mjy.getKcdw()); - mjyFfjl.setCkmz(mjyPlffItemFilter.get(0).getCkmz()); - mjyFfjl.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw()); + mjyFfjl.setCkmz(plffItemFilter.get(0).getCkmz()); + mjyFfjl.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); mjyFfjl.setLqr1Id(lqr1.getUserId()); mjyFfjl.setLqr2Id(lqr2.getUserId()); mjyFfjl.setFfr1Id(ffr1.getUserId()); @@ -895,10 +895,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setLqr2Mc(lqr2.getNickName()); mjyFfjl.setFfr1Mc(ffr1.getNickName()); mjyFfjl.setFfr2Mc(ffr2.getNickName()); - mjyFfjl.setFfzytj(mjyPlffItemFilter.get(0).getZytj()); + mjyFfjl.setFfzytj(plffItemFilter.get(0).getZytj()); mjyFfjl.setFfrq(now); - mjyFfjl.setFfbz(mjyPlffItemFilter.get(0).getRemark()); - mjyFfjl.setXmId(mjyPlffItemFilter.get(0).getXmId()); + mjyFfjl.setFfbz(plffItemFilter.get(0).getRemark()); + mjyFfjl.setMdIds(plffItemFilter.get(0).getMdIds()); mjyFfjlList.add(mjyFfjl); //endregion @@ -910,10 +910,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgj.setJcmc("领取发放"); mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); String jcnr = "出库量：" + mjy.getKc() - + ";转移条件：" + mjyPlffItemFilter.get(0).getZytj() - + ";出库毛重：" + mjyPlffItemFilter.get(0).getCkmz() + mjy.getKcdw() - + ";目的：" + mjyPlffItemFilter.get(0).getXmId() - + ";备注：" + mjyPlffItemFilter.get(0).getRemark(); + + ";转移条件：" + plffItemFilter.get(0).getZytj() + + ";出库毛重：" + plffItemFilter.get(0).getCkmz() + mjy.getKcdw() + + ";目的：" + plffItemFilter.get(0).getMdIds() + + ";备注：" + plffItemFilter.get(0).getRemark(); mjyJcgj.setJcnr(jcnr); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -928,16 +928,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTz.setQmyy("领取发放"); mjyTz.setCzl(mjy.getKc()); mjyTz.setCzldw(mjy.getKcdw()); - mjyTz.setRemark(mjyPlffItemFilter.get(0).getRemark()); + mjyTz.setRemark(plffItemFilter.get(0).getRemark()); mjyTzList.add(mjyTz); //endregion //region 更新发放信息 mjy.setCkl(mjy.getKc()); mjy.setCkldw(mjy.getKcdw()); - mjy.setFfzytj(mjyPlffItemFilter.get(0).getZytj()); - mjy.setCkmz(mjyPlffItemFilter.get(0).getCkmz()); - mjy.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw()); + mjy.setFfzytj(plffItemFilter.get(0).getZytj()); + mjy.setCkmz(plffItemFilter.get(0).getCkmz()); + mjy.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); mjy.setLqr1Id(lqr1.getUserId()); mjy.setLqr2Id(lqr2.getUserId()); mjy.setFfr1Id(ffr1.getUserId()); @@ -948,8 +948,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjy.setFfr2Mc(ffr2.getNickName()); mjy.setFfr2Mc(ffr2.getNickName()); mjy.setFfrq(now); - mjy.setFfbz(mjyPlffItemFilter.get(0).getRemark()); - mjy.setFfxmId(mjyPlffItemFilter.get(0).getXmId()); + mjy.setFfbz(plffItemFilter.get(0).getRemark()); + mjy.setMdIds(plffItemFilter.get(0).getMdIds()); mjy.setZjzt(ZjztEnum.yff.getValue()); //endregion @@ -970,7 +970,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void bj(@RequestBody MjyBjForm form) { + public void bj(@RequestBody BjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1025,7 +1025,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shbj(@RequestBody MjyShbjForm form) { + public void shbj(@RequestBody ShbjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1090,7 +1090,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void xgkc(@RequestBody MjyXgkcForm form) { + public void xgkc(@RequestBody XgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1144,7 +1144,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shxgkc(@RequestBody MjyShxgkcForm form) { + public void shxgkc(@RequestBody ShxgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml index 7cdf013..687edce 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml @@ -3,4 +3,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml index c0ff0f8..633ca26 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml @@ -12,7 +12,7 @@