feat：[试验管理][物资信息]给药制剂，麻精药

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

@@ -0,0 +1,64 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.hxhq.business.domain.StudyMaterialGyzj;
+import com.hxhq.business.service.IStudyMaterialGyzjService;
+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-05
+ */
+@RestController
+@RequestMapping("/business/studyMaterialGyzj")
+public class StudyMaterialGyzjController extends BaseController
+{
+    @Autowired
+    private IStudyMaterialGyzjService studyMaterialGyzjService;
+
+    /**
+     * 查询试验-物资列表-给药制剂列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(StudyMaterialGyzj studyMaterialGyzj)
+    {
+        startPage();
+        List<StudyMaterialGyzj> list = studyMaterialGyzjService.queryList(studyMaterialGyzj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取试验-物资列表-给药制剂详细信息
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(Long id)
+    {
+        return AjaxResult.success(studyMaterialGyzjService.getById(id));
+    }
+
+    /**
+     * 新增试验-物资列表-给药制剂信息
+     */
+    @PostMapping("/save")
+    public AjaxResult save(@RequestBody StudyMaterialGyzj studyMaterialGyzj)
+    {
+        return toAjax(studyMaterialGyzjService.saveOrUpdate(studyMaterialGyzj));
+    }
+
+    /**
+     * 删除试验-物资列表-给药制剂信息
+     */
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Long[] ids)
+    {
+        return toAjax(studyMaterialGyzjService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.hxhq.business.domain.StudyMaterialMjy;
+import com.hxhq.business.service.IStudyMaterialMjyService;
+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-05
+ */
+@RestController
+@RequestMapping("/business/studyMaterialMjy")
+public class StudyMaterialMjyController extends BaseController
+{
+    @Autowired
+    private IStudyMaterialMjyService studyMaterialMjyService;
+
+    /**
+     * 查询试验-物资列表-麻精药列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(StudyMaterialMjy studyMaterialMjy)
+    {
+        startPage();
+        List<StudyMaterialMjy> list = studyMaterialMjyService.queryList(studyMaterialMjy);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取试验-物资列表-麻精药详细信息
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(Long id)
+    {
+        return AjaxResult.success(studyMaterialMjyService.getById(id));
+    }
+
+    /**
+     * 新增试验-物资列表-麻精药信息
+     */
+    @PostMapping("/save")
+    public AjaxResult save(@RequestBody StudyMaterialMjy studyMaterialMjy)
+    {
+        return toAjax(studyMaterialMjyService.saveOrUpdate(studyMaterialMjy));
+    }
+
+    /**
+     * 删除试验-物资列表-麻精药信息
+     */
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Long[] ids)
+    {
+        return toAjax(studyMaterialMjyService.removeByIds(Arrays.asList(ids)));
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMaterialGyzj.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_material_gyzj
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+@TableName("t_study_material_gyzj")
+public class StudyMaterialGyzj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 给药制剂id */
+    private Long gyzjId;
+
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setGyzjId(Long gyzjId)
+    {
+        this.gyzjId = gyzjId;
+    }
+
+    public Long getGyzjId()
+    {
+        return gyzjId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMaterialMjy.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_material_mjy
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+@TableName("t_study_material_mjy")
+public class StudyMaterialMjy extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 麻精药id */
+    private Long mjyId;
+
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setMjyId(Long mjyId)
+    {
+        this.mjyId = mjyId;
+    }
+
+    public Long getMjyId()
+    {
+        return mjyId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java

@@ -1,7 +1,7 @@
 package com.hxhq.business.enums.zykgl;
 
 /**
- * 稽查轨迹类型:1:流程；3：编辑；5：人员
+ * 稽查轨迹类型:1:流程；3：编辑；5：人员；7：修改
  * @author tanfei
  */
 public enum JcgjlxEnum {
@@ -19,7 +19,12 @@ public enum JcgjlxEnum {
     /**
      * 人员
      */
-    ry(5, "人员");
+    ry(5, "人员"),
+
+    /**
+     * 修改
+     */
+    xg(7, "修改");
 
     private int value;
     private String text;

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyMaterialGyzj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-物资列表-给药制剂Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+public interface StudyMaterialGyzjMapper extends BaseMapper<StudyMaterialGyzj>
+{
+
+}

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

@@ -0,0 +1,14 @@
+package com.hxhq.business.mapper;
+
+import com.hxhq.business.domain.StudyMaterialMjy;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * 试验-物资列表-麻精药Mapper接口
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+public interface StudyMaterialMjyMapper extends BaseMapper<StudyMaterialMjy>
+{
+
+}

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

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyMaterialGyzj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验-物资列表-给药制剂Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+public interface IStudyMaterialGyzjService extends IService<StudyMaterialGyzj>
+{
+    /**
+     * 查询试验-物资列表-给药制剂列表
+     *
+     * @param studyMaterialGyzj 试验-物资列表-给药制剂
+     * @return 试验-物资列表-给药制剂集合
+     */
+    public List<StudyMaterialGyzj> queryList(StudyMaterialGyzj studyMaterialGyzj);
+
+}

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

@@ -0,0 +1,23 @@
+package com.hxhq.business.service;
+
+import java.util.List;
+import com.hxhq.business.domain.StudyMaterialMjy;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 试验-物资列表-麻精药Service接口
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+public interface IStudyMaterialMjyService extends IService<StudyMaterialMjy>
+{
+    /**
+     * 查询试验-物资列表-麻精药列表
+     *
+     * @param studyMaterialMjy 试验-物资列表-麻精药
+     * @return 试验-物资列表-麻精药集合
+     */
+    public List<StudyMaterialMjy> queryList(StudyMaterialMjy studyMaterialMjy);
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMaterialGyzjServiceImpl.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.StudyMaterialGyzjMapper;
+import com.hxhq.business.domain.StudyMaterialGyzj;
+import com.hxhq.business.service.IStudyMaterialGyzjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-物资列表-给药制剂Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+@Service
+public class StudyMaterialGyzjServiceImpl extends ServiceImpl<StudyMaterialGyzjMapper, StudyMaterialGyzj> implements IStudyMaterialGyzjService
+{
+    /**
+     * 查询试验-物资列表-给药制剂列表
+     *
+     * @param studyMaterialGyzj 试验-物资列表-给药制剂
+     * @return 试验-物资列表-给药制剂
+     */
+    @Override
+    public List<StudyMaterialGyzj> queryList(StudyMaterialGyzj studyMaterialGyzj)
+    {
+        QueryWrapper<StudyMaterialGyzj> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMaterialMjyServiceImpl.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.StudyMaterialMjyMapper;
+import com.hxhq.business.domain.StudyMaterialMjy;
+import com.hxhq.business.service.IStudyMaterialMjyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 试验-物资列表-麻精药Service业务层处理
+ *
+ * @author hxhq
+ * @date 2026-01-05
+ */
+@Service
+public class StudyMaterialMjyServiceImpl extends ServiceImpl<StudyMaterialMjyMapper, StudyMaterialMjy> implements IStudyMaterialMjyService
+{
+    /**
+     * 查询试验-物资列表-麻精药列表
+     *
+     * @param studyMaterialMjy 试验-物资列表-麻精药
+     * @return 试验-物资列表-麻精药
+     */
+    @Override
+    public List<StudyMaterialMjy> queryList(StudyMaterialMjy studyMaterialMjy)
+    {
+        QueryWrapper<StudyMaterialMjy> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMaterialGyzjMapper.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.StudyMaterialGyzjMapper">
+</mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMaterialMjyMapper.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.StudyMaterialMjyMapper">
+</mapper>