feat:[试验管理][物资列表]细菌列表、细胞列表

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/BacteriaController.java

@@ -0,0 +1,55 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.hxhq.business.domain.Cell;
+import com.hxhq.business.form.gsp.CzForm;
+import com.hxhq.business.form.gsp.GspCzForm;
+import com.hxhq.business.form.study.StudyCellSearchForm;
+import com.hxhq.common.security.annotation.RequiresPermissions;
+import com.hxhq.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.hxhq.business.domain.Bacteria;
+import com.hxhq.business.service.IBacteriaService;
+import com.hxhq.common.core.web.controller.BaseController;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.core.web.page.TableDataInfo;
+
+
+/**
+ * 细菌Controller
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@RestController
+@RequestMapping("/business/bacteria")
+public class BacteriaController extends BaseController
+{
+    @Autowired
+    private IBacteriaService bacteriaService;
+
+    /**
+     * 查询试验-细菌列表
+     */
+    @GetMapping("/studyList")
+    public TableDataInfo list(StudyCellSearchForm form)
+    {
+        startPage();
+        List<Bacteria> list = bacteriaService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+    /** 处置 */
+    @PostMapping("/cz")
+    public AjaxResult cz(@RequestBody @Validated CzForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        bacteriaService.cz(form);
+        return AjaxResult.success("操作成功");
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/CellController.java

@@ -0,0 +1,40 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.hxhq.business.form.study.StudyCellSearchForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.hxhq.business.domain.Cell;
+import com.hxhq.business.service.ICellService;
+import com.hxhq.common.core.web.controller.BaseController;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.core.web.page.TableDataInfo;
+
+
+/**
+ * 细胞Controller
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@RestController
+@RequestMapping("/business/cell")
+public class CellController extends BaseController
+{
+    @Autowired
+    private ICellService cellService;
+
+    /**
+     * 查询细胞列表
+     */
+    @GetMapping("/studyList")
+    public TableDataInfo list(StudyCellSearchForm form)
+    {
+        startPage();
+        List<Cell> list = cellService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java

@@ -0,0 +1,136 @@
+package com.hxhq.business.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 细菌对象 t_bacteria
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_bacteria")
+public class Bacteria extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 所属试验表单id */
+    private Long studyFormId;
+
+    /** 名称 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 体积 */
+    private String tj;
+
+    /** 体积单位 */
+    private String tjdw;
+
+    /** 来源 */
+    private String ly;
+
+    /** 失效日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sxr;
+
+    /** 试验名称 */
+    private String studyName;
+
+    public String getStudyName() {
+        return studyName;
+    }
+
+    public void setStudyName(String studyName) {
+        this.studyName = studyName;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setStudyFormId(Long studyFormId)
+    {
+        this.studyFormId = studyFormId;
+    }
+
+    public Long getStudyFormId()
+    {
+        return studyFormId;
+    }
+
+    public void setMc(String mc)
+    {
+        this.mc = mc;
+    }
+
+    public String getMc()
+    {
+        return mc;
+    }
+
+    public void setBh(String bh)
+    {
+        this.bh = bh;
+    }
+
+    public String getBh()
+    {
+        return bh;
+    }
+
+    public void setTj(String tj)
+    {
+        this.tj = tj;
+    }
+
+    public String getTj()
+    {
+        return tj;
+    }
+
+    public void setTjdw(String tjdw)
+    {
+        this.tjdw = tjdw;
+    }
+
+    public String getTjdw()
+    {
+        return tjdw;
+    }
+
+    public void setLy(String ly)
+    {
+        this.ly = ly;
+    }
+
+    public String getLy()
+    {
+        return ly;
+    }
+
+    public void setSxr(Date sxr)
+    {
+        this.sxr = sxr;
+    }
+
+    public Date getSxr()
+    {
+        return sxr;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/BacteriaJcgj.java

@@ -0,0 +1,110 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 细菌-稽查轨迹对象 t_bacteria_jcgj
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_bacteria_jcgj")
+public class BacteriaJcgj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 细菌id */
+    private Long bacteriaId;
+
+    /** 稽查轨迹类型:1:流程；3：编辑 */
+    private Integer jcgjlx;
+
+    /** 稽查名称 */
+    private String jcmc;
+
+    /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */
+    private Integer jcmcys;
+
+    /** 稽查内容 */
+    private String jcnr;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人名称 */
+    private String qmrMc;
+
+
+    public void setBacteriaId(Long bacteriaId)
+    {
+        this.bacteriaId = bacteriaId;
+    }
+
+    public Long getBacteriaId()
+    {
+        return bacteriaId;
+    }
+
+    public void setJcgjlx(Integer jcgjlx)
+    {
+        this.jcgjlx = jcgjlx;
+    }
+
+    public Integer getJcgjlx()
+    {
+        return jcgjlx;
+    }
+
+    public void setJcmc(String jcmc)
+    {
+        this.jcmc = jcmc;
+    }
+
+    public String getJcmc()
+    {
+        return jcmc;
+    }
+
+    public void setJcmcys(Integer jcmcys)
+    {
+        this.jcmcys = jcmcys;
+    }
+
+    public Integer getJcmcys()
+    {
+        return jcmcys;
+    }
+
+    public void setJcnr(String jcnr)
+    {
+        this.jcnr = jcnr;
+    }
+
+    public String getJcnr()
+    {
+        return jcnr;
+    }
+
+    public void setQmrId(Long qmrId)
+    {
+        this.qmrId = qmrId;
+    }
+
+    public Long getQmrId()
+    {
+        return qmrId;
+    }
+
+    public void setQmrMc(String qmrMc)
+    {
+        this.qmrMc = qmrMc;
+    }
+
+    public String getQmrMc()
+    {
+        return qmrMc;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Cell.java

@@ -0,0 +1,139 @@
+package com.hxhq.business.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 细胞对象 t_cell
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_cell")
+public class Cell extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 所属试验表单id */
+    private Long studyFormId;
+
+    /** 名称 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 体积 */
+    private String tj;
+
+    /** 体积单位 */
+    private String tjdw;
+
+    /** 来源 */
+    private String ly;
+
+    /** 失效日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sxr;
+
+    /** 所属试验名称 */
+    @TableField(exist = false)
+    private String studyName;
+
+    public String getStudyName() {
+        return studyName;
+    }
+
+    public void setStudyName(String studyName) {
+        this.studyName = studyName;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setStudyFormId(Long studyFormId)
+    {
+        this.studyFormId = studyFormId;
+    }
+
+    public Long getStudyFormId()
+    {
+        return studyFormId;
+    }
+
+    public void setMc(String mc)
+    {
+        this.mc = mc;
+    }
+
+    public String getMc()
+    {
+        return mc;
+    }
+
+    public void setBh(String bh)
+    {
+        this.bh = bh;
+    }
+
+    public String getBh()
+    {
+        return bh;
+    }
+
+    public void setTj(String tj)
+    {
+        this.tj = tj;
+    }
+
+    public String getTj()
+    {
+        return tj;
+    }
+
+    public void setTjdw(String tjdw)
+    {
+        this.tjdw = tjdw;
+    }
+
+    public String getTjdw()
+    {
+        return tjdw;
+    }
+
+    public void setLy(String ly)
+    {
+        this.ly = ly;
+    }
+
+    public String getLy()
+    {
+        return ly;
+    }
+
+    public void setSxr(Date sxr)
+    {
+        this.sxr = sxr;
+    }
+
+    public Date getSxr()
+    {
+        return sxr;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/CellJcgj.java

@@ -0,0 +1,110 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 细胞-稽查轨迹对象 t_cell_jcgj
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_cell_jcgj")
+public class CellJcgj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 细胞id */
+    private Long cellId;
+
+    /** 稽查轨迹类型:1:流程；3：编辑 */
+    private Integer jcgjlx;
+
+    /** 稽查名称 */
+    private String jcmc;
+
+    /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */
+    private Integer jcmcys;
+
+    /** 稽查内容 */
+    private String jcnr;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人名称 */
+    private String qmrMc;
+
+
+    public void setCellId(Long cellId)
+    {
+        this.cellId = cellId;
+    }
+
+    public Long getCellId()
+    {
+        return cellId;
+    }
+
+    public void setJcgjlx(Integer jcgjlx)
+    {
+        this.jcgjlx = jcgjlx;
+    }
+
+    public Integer getJcgjlx()
+    {
+        return jcgjlx;
+    }
+
+    public void setJcmc(String jcmc)
+    {
+        this.jcmc = jcmc;
+    }
+
+    public String getJcmc()
+    {
+        return jcmc;
+    }
+
+    public void setJcmcys(Integer jcmcys)
+    {
+        this.jcmcys = jcmcys;
+    }
+
+    public Integer getJcmcys()
+    {
+        return jcmcys;
+    }
+
+    public void setJcnr(String jcnr)
+    {
+        this.jcnr = jcnr;
+    }
+
+    public String getJcnr()
+    {
+        return jcnr;
+    }
+
+    public void setQmrId(Long qmrId)
+    {
+        this.qmrId = qmrId;
+    }
+
+    public Long getQmrId()
+    {
+        return qmrId;
+    }
+
+    public void setQmrMc(String qmrMc)
+    {
+        this.qmrMc = qmrMc;
+    }
+
+    public String getQmrMc()
+    {
+        return qmrMc;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyBacteria.java

@@ -0,0 +1,45 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验-细菌关联对象 t_study_bacteria
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_study_bacteria")
+public class StudyBacteria extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 细菌id */
+    private Long resourceId;
+
+    /** 试验id */
+    private Long studyId;
+
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyCell.java

@@ -0,0 +1,45 @@
+package com.hxhq.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.domain.MpBaseEntity;
+
+
+/**
+ * 试验-细胞关联对象 t_study_cell
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@TableName("t_study_cell")
+public class StudyCell extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 细胞id */
+    private Long resourceId;
+
+    /** 试验id */
+    private Long studyId;
+
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/CzForm.java

@@ -0,0 +1,82 @@
+package com.hxhq.business.form.gsp;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 资源处置
+ * @author HanLong
+ */
+public class CzForm {
+
+    /** 资源id */
+    @NotNull(message = "请选择处置对象")
+    private Long id;
+
+    /** 处置原因 */
+    @NotEmpty(message = "请输入处置原因")
+    private String remark;
+
+    /** 处置量 */
+    @NotEmpty(message = "请输入处置量")
+    private String czl;
+
+    /** 处置方式 */
+    @NotEmpty(message = "请选择处置方式")
+    private String czfs;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    @NotEmpty(message = "请输入签名人密码")
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCzl() {
+        return czl;
+    }
+
+    public void setCzl(String czl) {
+        this.czl = czl;
+    }
+
+    public String getCzfs() {
+        return czfs;
+    }
+
+    public void setCzfs(String czfs) {
+        this.czfs = czfs;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyCellSearchForm.java

@@ -0,0 +1,84 @@
+package com.hxhq.business.form.study;
+
+/**
+ * 试验物资搜索列表
+ */
+public class StudyCellSearchForm {
+
+    /** 名称/代号 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 来源 */
+    private String ly;
+
+    /** 所属试验名称 */
+    private String studyName;
+
+    /** 有效期开始日期 */
+    private String startDate;
+
+    /** 有效期结束日期 */
+    private String endDate;
+
+    /** 试验id */
+    private Long studyId;
+
+    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 getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
+    public String getStudyName() {
+        return studyName;
+    }
+
+    public void setStudyName(String studyName) {
+        this.studyName = studyName;
+    }
+
+    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 Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaJcgjMapper.java

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.BacteriaJcgj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 细菌-稽查轨迹Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface BacteriaJcgjMapper extends BaseMapper<BacteriaJcgj>
+{
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaMapper.java

@@ -0,0 +1,22 @@
+package com.hxhq.business.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hxhq.business.domain.Bacteria;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.Cell;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 细菌Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface BacteriaMapper extends BaseMapper<Bacteria>
+{
+
+    List<Bacteria> queryStudyList(@Param("ew") Wrapper<Bacteria> queryWrapper);
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellJcgjMapper.java

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.CellJcgj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 细胞-稽查轨迹Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface CellJcgjMapper extends BaseMapper<CellJcgj>
+{
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellMapper.java

@@ -0,0 +1,23 @@
+package com.hxhq.business.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hxhq.business.domain.Cell;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.Mjy;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 细胞Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface CellMapper extends BaseMapper<Cell>
+{
+
+    List<Cell> queryStudyList(@Param("ew") Wrapper<Cell> queryWrapper);
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyBacteriaMapper.java

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyBacteria;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-细菌关联Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface StudyBacteriaMapper extends BaseMapper<StudyBacteria>
+{
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyCellMapper.java

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyCell;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-细胞关联Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface StudyCellMapper extends BaseMapper<StudyCell>
+{
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaJcgjService.java

@@ -0,0 +1,34 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.BacteriaJcgj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 细菌-稽查轨迹Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface IBacteriaJcgjService extends IService<BacteriaJcgj>
+{
+    /**
+     * 查询细菌-稽查轨迹列表
+     *
+     * @param bacteriaJcgj 细菌-稽查轨迹
+     * @return 细菌-稽查轨迹集合
+     */
+    public List<BacteriaJcgj> queryList(BacteriaJcgj bacteriaJcgj);
+
+    /**
+     * 新增稽查轨迹
+     * @param resourceId 细菌id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param jcrId 稽查人id
+     * @param jcrMc 稽查人名称
+     */
+    public  void saveJcgj(Long  resourceId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc);
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IBacteriaService.java

@@ -0,0 +1,27 @@
+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.form.gsp.CzForm;
+import com.hxhq.business.form.study.StudyCellSearchForm;
+
+/**
+ * 细菌Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface IBacteriaService extends IService<Bacteria>
+{
+    /**
+     * 查询细菌列表
+     *
+     * @param form 细菌
+     * @return 细菌集合
+     */
+    List<Bacteria> queryStudyList(StudyCellSearchForm form);
+
+    /** 处置 */
+    void cz(CzForm form);
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellJcgjService.java

@@ -0,0 +1,34 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.CellJcgj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 细胞-稽查轨迹Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface ICellJcgjService extends IService<CellJcgj>
+{
+    /**
+     * 查询细胞-稽查轨迹列表
+     *
+     * @param cellJcgj 细胞-稽查轨迹
+     * @return 细胞-稽查轨迹集合
+     */
+    public List<CellJcgj> queryList(CellJcgj cellJcgj);
+
+    /**
+     * 新增稽查轨迹
+     * @param resourceId 细胞id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param jcrId 稽查人id
+     * @param jcrMc 稽查人名称
+     */
+    public  void saveJcgj(Long  resourceId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc);
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ICellService.java

@@ -0,0 +1,26 @@
+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.form.gsp.CzForm;
+import com.hxhq.business.form.study.StudyCellSearchForm;
+
+/**
+ * 细胞Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface ICellService extends IService<Cell>
+{
+    /**
+     * 查询细胞列表
+     *
+     * @param form 细胞
+     * @return 细胞集合
+     */
+    public List<Cell> queryStudyList(StudyCellSearchForm form);
+
+    public void cz(CzForm form);
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyBacteriaService.java

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyBacteria;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验-细菌关联Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface IStudyBacteriaService extends IService<StudyBacteria>
+{
+    /**
+     * 查询试验-细菌关联列表
+     *
+     * @param studyBacteria 试验-细菌关联
+     * @return 试验-细菌关联集合
+     */
+    public List<StudyBacteria> queryList(StudyBacteria studyBacteria);
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyCellService.java

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyCell;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验-细胞关联Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+public interface IStudyCellService extends IService<StudyCell>
+{
+    /**
+     * 查询试验-细胞关联列表
+     *
+     * @param studyCell 试验-细胞关联
+     * @return 试验-细胞关联集合
+     */
+    public List<StudyCell> queryList(StudyCell studyCell);
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaJcgjServiceImpl.java

@@ -0,0 +1,49 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.GspJcgj;
+import com.hxhq.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.BacteriaJcgjMapper;
+import com.hxhq.business.domain.BacteriaJcgj;
+import com.hxhq.business.service.IBacteriaJcgjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 细菌-稽查轨迹Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class BacteriaJcgjServiceImpl extends ServiceImpl<BacteriaJcgjMapper, BacteriaJcgj> implements IBacteriaJcgjService
+{
+    /**
+     * 查询细菌-稽查轨迹列表
+     *
+     * @param bacteriaJcgj 细菌-稽查轨迹
+     * @return 细菌-稽查轨迹
+     */
+    @Override
+    public List<BacteriaJcgj> queryList(BacteriaJcgj bacteriaJcgj)
+    {
+        QueryWrapper<BacteriaJcgj> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public void saveJcgj(Long resourceId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) {
+        BacteriaJcgj jcgj = new BacteriaJcgj();
+        jcgj.setBacteriaId(resourceId);
+        jcgj.setJcgjlx(jcgjlx);
+        jcgj.setJcmc(jcmc);
+        jcgj.setJcmcys(jcmcys);
+        jcgj.setJcnr(jcnr);
+        jcgj.setQmrId(jcrId);
+        jcgj.setQmrMc(jcrMc);
+        this.save(jcgj);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java

@@ -0,0 +1,93 @@
+package com.hxhq.business.service.impl;
+
+import java.math.BigDecimal;
+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.enums.zykgl.JcgjlxEnum;
+import com.hxhq.business.enums.zykgl.JcmcysEnum;
+import com.hxhq.business.form.gsp.CzForm;
+import com.hxhq.business.form.study.StudyCellSearchForm;
+import com.hxhq.business.service.IBacteriaJcgjService;
+import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.core.utils.DateUtils;
+import com.hxhq.common.core.utils.StringUtils;
+import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysUserService;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.BacteriaMapper;
+import com.hxhq.business.domain.Bacteria;
+import com.hxhq.business.service.IBacteriaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 细菌Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class BacteriaServiceImpl extends ServiceImpl<BacteriaMapper, Bacteria> implements IBacteriaService
+{
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private IBacteriaJcgjService bacteriaJcgjService;
+
+    @Override
+    public List<Bacteria> queryStudyList(StudyCellSearchForm form) {
+        QueryWrapper<Bacteria> queryWrapper = Wrappers.query();
+        queryWrapper.eq("sb.del_flag", 0)
+                .eq("c.del_flag", 0);
+        if(form.getStudyId() != null) {
+            queryWrapper.eq("sb.study_id", form.getStudyId());
+        }
+        if(StringUtils.isNotEmpty(form.getMc())) {
+            queryWrapper.like("c.mc", form.getMc());
+        }
+        if(StringUtils.isNotEmpty(form.getBh())) {
+            queryWrapper.like("c.bh", form.getBh());
+        }
+        if(StringUtils.isNotEmpty(form.getLy())) {
+            queryWrapper.like("c.ly", form.getLy());
+        }
+        if(StringUtils.isNotEmpty(form.getStartDate())) {
+            queryWrapper.ge("c.sxr", form.getStartDate());
+        }
+        if(StringUtils.isNotEmpty(form.getEndDate())) {
+            queryWrapper.le("c.sxr", form.getEndDate());
+        }
+        if(StringUtils.isNotEmpty(form.getStudyName())) {
+            queryWrapper.like("t.name", form.getStudyName());
+        }
+        queryWrapper.orderByDesc("c.bh");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
+    @Override
+    public void cz(CzForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        sysUserService.checkPassword(qmr, form.getQmrmm(), true);
+
+        Bacteria bacteria = this.getById(form.getId());
+        if(bacteria == null) {
+            throw new ServiceException("细菌不存在或已删除");
+        }
+        if(!NumberUtils.isParsable(form.getCzl())) {
+            throw new ServiceException("请输入正确的处置量");
+        }
+        BigDecimal tj = new BigDecimal(bacteria.getTj());
+        BigDecimal czl = new BigDecimal(form.getCzl());
+        tj = tj.subtract(czl);
+        bacteria.setTj(tj.toString());
+        this.updateById(bacteria);
+
+
+        bacteriaJcgjService.saveJcgj(bacteria.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.blue.getValue(), null, qmr.getUserId(), qmr.getNickName());
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellJcgjServiceImpl.java

@@ -0,0 +1,49 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.BacteriaJcgj;
+import com.hxhq.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.CellJcgjMapper;
+import com.hxhq.business.domain.CellJcgj;
+import com.hxhq.business.service.ICellJcgjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 细胞-稽查轨迹Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class CellJcgjServiceImpl extends ServiceImpl<CellJcgjMapper, CellJcgj> implements ICellJcgjService
+{
+    /**
+     * 查询细胞-稽查轨迹列表
+     *
+     * @param cellJcgj 细胞-稽查轨迹
+     * @return 细胞-稽查轨迹
+     */
+    @Override
+    public List<CellJcgj> queryList(CellJcgj cellJcgj)
+    {
+        QueryWrapper<CellJcgj> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public void saveJcgj(Long resourceId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) {
+        CellJcgj jcgj = new CellJcgj();
+        jcgj.setCellId(resourceId);
+        jcgj.setJcgjlx(jcgjlx);
+        jcgj.setJcmc(jcmc);
+        jcgj.setJcmcys(jcmcys);
+        jcgj.setJcnr(jcnr);
+        jcgj.setQmrId(jcrId);
+        jcgj.setQmrMc(jcrMc);
+        this.save(jcgj);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java

@@ -0,0 +1,91 @@
+package com.hxhq.business.service.impl;
+
+import java.math.BigDecimal;
+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.enums.zykgl.JcgjlxEnum;
+import com.hxhq.business.enums.zykgl.JcmcysEnum;
+import com.hxhq.business.form.gsp.CzForm;
+import com.hxhq.business.form.study.StudyCellSearchForm;
+import com.hxhq.business.service.ICellJcgjService;
+import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.core.utils.StringUtils;
+import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysUserService;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.CellMapper;
+import com.hxhq.business.domain.Cell;
+import com.hxhq.business.service.ICellService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 细胞Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class CellServiceImpl extends ServiceImpl<CellMapper, Cell> implements ICellService
+{
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ICellJcgjService cellJcgjService;
+
+    @Override
+    public List<Cell> queryStudyList(StudyCellSearchForm form) {
+        QueryWrapper<Cell> queryWrapper = Wrappers.query();
+        queryWrapper.eq("sc.del_flag", 0)
+                .eq("c.del_flag", 0);
+        if(form.getStudyId() != null) {
+            queryWrapper.eq("sc.study_id", form.getStudyId());
+        }
+        if(StringUtils.isNotEmpty(form.getMc())) {
+            queryWrapper.like("c.mc", form.getMc());
+        }
+        if(StringUtils.isNotEmpty(form.getBh())) {
+            queryWrapper.like("c.bh", form.getBh());
+        }
+        if(StringUtils.isNotEmpty(form.getLy())) {
+            queryWrapper.like("c.ly", form.getLy());
+        }
+        if(StringUtils.isNotEmpty(form.getStartDate())) {
+            queryWrapper.ge("c.sxr", form.getStartDate());
+        }
+        if(StringUtils.isNotEmpty(form.getEndDate())) {
+            queryWrapper.le("c.sxr", form.getEndDate());
+        }
+        if(StringUtils.isNotEmpty(form.getStudyName())) {
+            queryWrapper.like("t.name", form.getStudyName());
+        }
+        queryWrapper.orderByDesc("c.bh");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
+    @Override
+    public void cz(CzForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        sysUserService.checkPassword(qmr, form.getQmrmm(), true);
+
+        Cell cell = this.getById(form.getId());
+        if(cell == null) {
+            throw new ServiceException("细胞不存在或已删除");
+        }
+        if(!NumberUtils.isParsable(form.getCzl())) {
+            throw new ServiceException("请输入正确的处置量");
+        }
+        BigDecimal tj = new BigDecimal(cell.getTj());
+        BigDecimal czl = new BigDecimal(form.getCzl());
+        tj = tj.subtract(czl);
+        cell.setTj(tj.toString());
+        this.updateById(cell);
+
+
+        cellJcgjService.saveJcgj(cell.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.blue.getValue(), null, qmr.getUserId(), qmr.getNickName());
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyBacteriaServiceImpl.java

@@ -0,0 +1,35 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+        import com.hxhq.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudyBacteriaMapper;
+import com.hxhq.business.domain.StudyBacteria;
+import com.hxhq.business.service.IStudyBacteriaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-细菌关联Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class StudyBacteriaServiceImpl extends ServiceImpl<StudyBacteriaMapper, StudyBacteria> implements IStudyBacteriaService
+{
+    /**
+     * 查询试验-细菌关联列表
+     *
+     * @param studyBacteria 试验-细菌关联
+     * @return 试验-细菌关联
+     */
+    @Override
+    public List<StudyBacteria> queryList(StudyBacteria studyBacteria)
+    {
+        QueryWrapper<StudyBacteria> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyCellServiceImpl.java

@@ -0,0 +1,35 @@
+package com.hxhq.business.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+        import com.hxhq.common.core.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.hxhq.business.mapper.StudyCellMapper;
+import com.hxhq.business.domain.StudyCell;
+import com.hxhq.business.service.IStudyCellService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-细胞关联Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-12
+ */
+@Service
+public class StudyCellServiceImpl extends ServiceImpl<StudyCellMapper, StudyCell> implements IStudyCellService
+{
+    /**
+     * 查询试验-细胞关联列表
+     *
+     * @param studyCell 试验-细胞关联
+     * @return 试验-细胞关联
+     */
+    @Override
+    public List<StudyCell> queryList(StudyCell studyCell)
+    {
+        QueryWrapper<StudyCell> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaJcgjMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.BacteriaJcgjMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.BacteriaMapper">
+    <select id="queryStudyList" resultType="com.hxhq.business.domain.Bacteria">
+        select c.*, s.name as studyName
+        FROM `t_study_bacteria` sb
+        join  `t_bacteria` c on c.id=sb.resource_id
+        LEFT JOIN `t_study` s on s.id = sb.study_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellJcgjMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.CellJcgjMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.CellMapper">
+    <select id="queryStudyList" resultType="com.hxhq.business.domain.Cell">
+        select c.*, s.name as studyName
+        FROM `t_study_cell` sc
+        join  `t_cell` c on c.id=sc.resource_id
+        LEFT JOIN `t_study` s on s.id = sc.study_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyBacteriaMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.StudyBacteriaMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyCellMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.StudyCellMapper">
+</mapper>