From b0d808d90616a0fc50bf11ead17af26f0dc0c77b Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Mar 2026 10:03:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E7=BB=86=E8=83=9E=E7=BB=86=E8=8F=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/study/StudyFormFillResourceTypeEnum.java | 14 ++++++++++++-- .../com/hxhq/business/enums/template/ProductEnum.java | 16 +++++++++++++--- .../java/com/hxhq/business/service/IBacteriaService.java | 9 +++++++++ .../java/com/hxhq/business/service/ICellService.java | 9 +++++++++ .../hxhq/business/service/impl/BacteriaServiceImpl.java | 9 +++++++++ .../com/hxhq/business/service/impl/CellServiceImpl.java | 9 +++++++++ .../business/service/impl/StudyFormFillServiceImpl.java | 14 ++++++++++---- 7 files changed, 71 insertions(+), 9 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java index 20c4c01..4b5a209 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.study; /** - * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品（产生的为null） + * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌 * @author tanfei */ public enum StudyFormFillResourceTypeEnum { @@ -24,7 +24,17 @@ public enum StudyFormFillResourceTypeEnum { /** * 供试品 */ - gsp(7, "供试品"); + gsp(7, "供试品"), + + /** + * 细胞 + */ + Cell(9, "细胞"), + + /** + * 细菌 + */ + Bacteria(11, "细菌"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java index 44bf1dc..02b490e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.template; /** - * 产物：1：试剂；3：给药制剂；5：麻精药；7：无 + * 产物：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌 * @author tanfei */ public enum ProductEnum { @@ -22,9 +22,19 @@ public enum ProductEnum { Mjy(5, "麻精药"), /** - * 无 + * 供试品 */ - none(7, "无"); + none(7, "供试品"), + + /** + * 细胞 + */ + Cell(9, "细胞"), + + /** + * 细菌 + */ + Bacteria(11, "细菌"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaService.java index 0cd9414..199b05c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaService.java @@ -3,6 +3,8 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.Bacteria; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.StudyFormFill; +import com.hxhq.business.domain.Template; import com.hxhq.business.form.gsp.CzForm; import com.hxhq.business.form.study.StudyCellSearchForm; @@ -27,4 +29,11 @@ public interface IBacteriaService extends IService * @param form 处置表单 */ void cz(CzForm form); + + /** + * 表单生成细菌逻辑处理 + * @param studyFormFill + * @param template + */ + void genResource(StudyFormFill studyFormFill, Template template); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellService.java index 993110e..1e509c6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellService.java @@ -3,6 +3,8 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.Cell; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.StudyFormFill; +import com.hxhq.business.domain.Template; import com.hxhq.business.form.gsp.CzForm; import com.hxhq.business.form.study.StudyCellSearchForm; @@ -27,4 +29,11 @@ public interface ICellService extends IService * @param form 处置表单 */ public void cz(CzForm form); + + /** + * 表单生成细胞逻辑处理 + * @param studyFormFill + * @param template + */ + void genResource(StudyFormFill studyFormFill, Template template); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java index 7954046..f4910a2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.Cell; +import com.hxhq.business.domain.StudyFormFill; +import com.hxhq.business.domain.Template; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.gsp.CzForm; @@ -22,6 +24,7 @@ import com.hxhq.business.mapper.BacteriaMapper; import com.hxhq.business.domain.Bacteria; import com.hxhq.business.service.IBacteriaService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * 细菌Service业务层处理 @@ -89,4 +92,10 @@ public class BacteriaServiceImpl extends ServiceImpl i bacteriaJcgjService.saveJcgj(bacteria.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.blue.getValue(), null, qmr.getUserId(), qmr.getNickName()); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void genResource(StudyFormFill studyFormFill, Template template) { + //todo 需要判断当前模板的产物是细菌才处理生成的 + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java index 6989c84..ab3484e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.Bacteria; +import com.hxhq.business.domain.StudyFormFill; +import com.hxhq.business.domain.Template; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.gsp.CzForm; @@ -21,6 +23,7 @@ import com.hxhq.business.mapper.CellMapper; import com.hxhq.business.domain.Cell; import com.hxhq.business.service.ICellService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * 细胞Service业务层处理 @@ -87,4 +90,10 @@ public class CellServiceImpl extends ServiceImpl implements IC cellJcgjService.saveJcgj(cell.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.blue.getValue(), null, qmr.getUserId(), qmr.getNickName()); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void genResource(StudyFormFill studyFormFill, Template template) { + //todo 需要判断当前模板的产物是细菌才处理生成的 + } } 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 e3e31ac..c25b5f5 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 @@ -80,6 +80,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl queryQxList(StudyFormFill form) { @@ -625,8 +629,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl