From b26a419dc353cc3d14dc6db503063e19744ed127 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 6 Feb 2026 16:08:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormFillController.java | 48 +++++- .../form/study/StudyFormConfigurationForm.java | 188 +++++++++++++++++++++ .../form/study/StudyFormFillSubpackageForm.java | 87 ++++++++++ .../study/StudyFormFillSubpackageItemForm.java | 48 ++++++ .../business/service/IStudyFormFillService.java | 29 +++- .../service/impl/StudyFormFillServiceImpl.java | 97 ++++++++++- 6 files changed, 483 insertions(+), 14 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormConfigurationForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageItemForm.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java index c5681dd..2c40f5b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java @@ -1,21 +1,25 @@ package com.hxhq.business.controller; -import java.util.HashMap; -import java.util.List; +import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; import com.hxhq.business.dto.study.StudyFormFillListDto; import com.hxhq.business.enums.zykgl.JcgjlxEnum; -import com.hxhq.business.form.study.StudyFormFillGcForm; -import com.hxhq.business.form.study.StudyFormFillShfzForm; -import com.hxhq.business.form.study.StudyFormFillSearchForm; -import com.hxhq.business.form.study.StudyFormUpdateForm; +import com.hxhq.business.enums.zykgl.JcmcysEnum; +import com.hxhq.business.enums.zykgl.JyztEnum; +import com.hxhq.business.enums.zykgl.ZjztEnum; +import com.hxhq.business.form.sj.SjBjForm; +import com.hxhq.business.form.sj.SjSubpackageForm; +import com.hxhq.business.form.study.*; import com.hxhq.business.service.*; +import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.pdf.PdfExportUtil; import com.hxhq.common.security.annotation.Logical; import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -53,6 +57,38 @@ public class StudyFormFillController extends BaseController { public String localFilePrefix; /** + * 开始配置 + * @return + */ + @PostMapping("/startConfiguration") + public AjaxResult startConfiguration(@RequestBody StudyFormConfigurationForm form) { + studyFormFillService.startConfiguration(form); + return AjaxResult.success("操作成功"); + } + + /** + * 配置完成 + * @param form + * @return + */ + @PostMapping("/configurationCompleted") + public AjaxResult configurationCompleted(@RequestBody StudyFormConfigurationForm form) { + studyFormFillService.configurationCompleted(form); + return AjaxResult.success("操作成功"); + } + + /** + * 分装 + * @param form + * @return + */ + @PostMapping("/subpackage") + public AjaxResult subpackage(@RequestBody StudyFormFillSubpackageForm form) { + studyFormFillService.subpackage(form); + return AjaxResult.success("操作成功"); + } + + /** * 列表 */ @GetMapping("/list") diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormConfigurationForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormConfigurationForm.java new file mode 100644 index 0000000..75a748c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormConfigurationForm.java @@ -0,0 +1,188 @@ +package com.hxhq.business.form.study; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 试剂编辑 + * @author HanLong + */ +public class StudyFormConfigurationForm { + + private Long id; + + /** 名称 */ + private String mc; + + /** 编号 */ + private String bh; + + /** 浓度/含量/纯度 */ + private String nd; + + /** 浓度单位 */ + private String nddw; + + /** 库存 */ + private String kc; + + /** 库存单位 */ + private String kcdw; + + /** 存储条件 */ + private String cctj; + + /** 存储位置 */ + private String ccwz; + + /** 失效日 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sxr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 签名备注 */ + private String qmbz; + + /** 试验id */ + private Long studyId; + + /** 试验表单id */ + private Long studyFormId; + + /** 所属部门/学科 */ + private Long studySubjectId; + + public Long getStudyId() { + return studyId; + } + + public void setStudyId(Long studyId) { + this.studyId = studyId; + } + + public Long getStudyFormId() { + return studyFormId; + } + + public void setStudyFormId(Long studyFormId) { + this.studyFormId = studyFormId; + } + + public Long getStudySubjectId() { + return studySubjectId; + } + + public void setStudySubjectId(Long studySubjectId) { + this.studySubjectId = studySubjectId; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMc() { + return mc; + } + + public void setMc(String mc) { + this.mc = mc; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + public String 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 getCctj() { + return cctj; + } + + public void setCctj(String cctj) { + this.cctj = cctj; + } + + public String getCcwz() { + return ccwz; + } + + public void setCcwz(String ccwz) { + this.ccwz = ccwz; + } + + public Date getSxr() { + return sxr; + } + + public void setSxr(Date sxr) { + this.sxr = sxr; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public String getQmbz() { + return qmbz; + } + + public void setQmbz(String qmbz) { + this.qmbz = qmbz; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageForm.java new file mode 100644 index 0000000..2765707 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageForm.java @@ -0,0 +1,87 @@ +package com.hxhq.business.form.study; + +import java.util.List; + +/** + * 试剂分装参数 + * @author HanLong + */ +public class StudyFormFillSubpackageForm { + + /** 试验id */ + private Long studyId; + + /** 试验表单id */ + private Long studyFormId; + + /** 学科id */ + private Long studySubjectId; + + /** 母液编号 */ + private String bh; + + /** 母液浓度 */ + private String nd; + + /** 母液浓度单位 */ + private String nddw; + + /** 分装数据 */ + private List list; + + public Long getStudyId() { + return studyId; + } + + public void setStudyId(Long studyId) { + this.studyId = studyId; + } + + public Long getStudyFormId() { + return studyFormId; + } + + public void setStudyFormId(Long studyFormId) { + this.studyFormId = studyFormId; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getNddw() { + return nddw; + } + + public void setNddw(String nddw) { + this.nddw = nddw; + } + + public Long getStudySubjectId() { + return studySubjectId; + } + + public void setStudySubjectId(Long studySubjectId) { + this.studySubjectId = studySubjectId; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageItemForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageItemForm.java new file mode 100644 index 0000000..2f215a9 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageItemForm.java @@ -0,0 +1,48 @@ +package com.hxhq.business.form.study; + +import java.util.List; + +/** + * 分装参数 + * @author HanLong + */ +public class StudyFormFillSubpackageItemForm { + /** + * 编号 + */ + private String bh; + + /** + * 库存 + */ + private String kc; + + /** + * 库存单位 + */ + private String kcdw; + + public String getBh() { + return bh; + } + + public void setBh(String bh) { + this.bh = bh; + } + + 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; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java index f2bc2a5..d9ce715 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java @@ -4,10 +4,7 @@ import java.util.List; import com.hxhq.business.domain.StudyFormFill; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.study.StudyFormFillListDto; -import com.hxhq.business.form.study.StudyFormFillGcForm; -import com.hxhq.business.form.study.StudyFormFillSearchForm; -import com.hxhq.business.form.study.StudyFormFillShfzForm; -import com.hxhq.business.form.study.StudyFormUpdateForm; +import com.hxhq.business.form.study.*; /** * 试验-填报单Service接口 @@ -25,6 +22,30 @@ public interface IStudyFormFillService extends IService */ public List queryList(StudyFormFillSearchForm form); + + /** + * 开始配置 + * @param form + * @return + */ + public void startConfiguration(StudyFormConfigurationForm form); + + + /** + * 配置完成 + * @param form + * @return + */ + public void configurationCompleted(StudyFormConfigurationForm form); + + + /** + * 分装 + * @param form + * @return + */ + public void subpackage(StudyFormFillSubpackageForm form); + /** * 详情 * diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 86f8d8b..e2d3b8e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -12,6 +12,7 @@ import com.hxhq.business.enums.NormalEnum; import com.hxhq.business.enums.SnTypeEnum; import com.hxhq.business.enums.study.StudyFormFillBdztEnum; import com.hxhq.business.enums.study.StudyTypeEnum; +import com.hxhq.business.enums.template.ProductEnum; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.study.*; @@ -70,6 +71,88 @@ public class StudyFormFillServiceImpl extends ServiceImpl