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

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

@@ -0,0 +1,85 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.hxhq.business.dto.gyzj.ListDto;
+import com.hxhq.business.form.gyzj.BjForm;
+import com.hxhq.business.form.gyzj.CzyjForm;
+import com.hxhq.business.form.gyzj.GhForm;
+import com.hxhq.business.form.gyzj.SearchForm;
+import com.hxhq.business.service.IGyzjService;
+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 com.hxhq.business.domain.StudyGyzj;
+import com.hxhq.business.service.IStudyGyzjService;
+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-09
+ */
+@RestController
+@RequestMapping("/business/studyGyzj")
+public class StudyGyzjController extends BaseController
+{
+    @Autowired
+    private IGyzjService gyzjService;
+
+    /**
+     * 列表
+     */
+    @RequiresPermissions({"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"})
+    @GetMapping("/list")
+    public TableDataInfo list(SearchForm form)
+    {
+        startPage();
+        List<ListDto> list = gyzjService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 处置药剂
+     */
+    @PostMapping("/czyj")
+    @RequiresPermissions({"business:studyGyzj:xq","business:nonTrialGyzj:xq","business:drugGyzj:xq"})
+    public AjaxResult czyj(@RequestBody CzyjForm form)
+    {
+        form.setClrId(SecurityUtils.getUserId());
+        gyzjService.czyj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 编辑
+     */
+    @PostMapping("bj")
+    @RequiresPermissions({"business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"})
+    public AjaxResult bj(@RequestBody BjForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gyzjService.bj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 归还
+     */
+    @PostMapping("gh")
+    @RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
+    public AjaxResult gh(@RequestBody GhForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        form.setJsr1Id(SecurityUtils.getUserId());
+        gyzjService.gh(form);
+        return AjaxResult.success("操作成功");
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.hxhq.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.hxhq.business.dto.mjy.ListDto;
+import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IMjyService;
+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 com.hxhq.business.domain.StudyMjy;
+import com.hxhq.business.service.IStudyMjyService;
+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-09
+ */
+@RestController
+@RequestMapping("/business/studyMjy")
+public class StudyMjyController extends BaseController
+{
+    @Autowired
+    private IMjyService mjyService;
+
+    /**
+     * 列表
+     */
+    @RequiresPermissions({"business:studyMjy:list","business:nonTrialMjy:list","business:drugMjy:list"})
+    @GetMapping("/list")
+    public TableDataInfo list(SearchForm form)
+    {
+        startPage();
+        List<ListDto> list = mjyService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 处置药剂
+     */
+    @PostMapping("/czyj")
+    @RequiresPermissions({"business:studyMjy:czyj","business:nonTrialMjy:czyj","business:drugMjy:czyj"})
+    public AjaxResult czyj(@RequestBody CzyjForm form)
+    {
+        form.setClrId(SecurityUtils.getUserId());
+        mjyService.czyj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 编辑
+     */
+    @PostMapping("bj")
+    @RequiresPermissions({"business:studyMjy:bj","business:nonTrialMjy:bj","business:drugMjy:bj"})
+    public AjaxResult bj(@RequestBody BjForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.bj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 修改库存
+     */
+    @PostMapping("xgkc")
+    @RequiresPermissions({"business:studyMjy:xgkc","business:nonTrialMjy:xgkc","business:drugMjy:xgkc"})
+    public AjaxResult xgkc(@RequestBody XgkcForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.xgkc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 归还
+     */
+    @PostMapping("gh")
+    @RequiresPermissions({"business:studyMjy:gh","business:nonTrialMjy:gh","business:drugMjy:gh"})
+    public AjaxResult gh(@RequestBody GhForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.gh(form);
+        return AjaxResult.success("操作成功");
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.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_gyzj
+ *
+ * @author hxhq
+ * @date 2026-01-09
+ */
+@TableName("t_study_gyzj")
+public class StudyGyzj extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 资源id */
+    private Long resourceId;
+
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.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_mjy
+ *
+ * @author hxhq
+ * @date 2026-01-09
+ */
+@TableName("t_study_mjy")
+public class StudyMjy extends MpBaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属试验id */
+    private Long studyId;
+
+    /** 资源id */
+    private Long resourceId;
+
+
+    public void setStudyId(Long studyId)
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId()
+    {
+        return studyId;
+    }
+
+    public void setResourceId(Long resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId()
+    {
+        return resourceId;
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java

@@ -27,6 +27,17 @@ public class SearchForm {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
+    /** 试验id */
+    private Long studyId;
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
     public String getMc() {
         return mc;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java

@@ -27,6 +27,17 @@ public class SearchForm {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
+    /** 试验id */
+    private Long studyId;
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
     public String getMc() {
         return mc;
     }

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

@@ -22,6 +22,13 @@ public interface GyzjMapper extends BaseMapper
      * @param queryWrapper
      * @return
      */
+    List<ListDto> queryStudyList(@Param("ew") Wrapper<Gyzj> queryWrapper);
+
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
     List<ListDto> queryList(@Param("ew") Wrapper<Gyzj> queryWrapper);
 
     /**

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

@@ -22,6 +22,13 @@ public interface MjyMapper extends BaseMapper
      * @param queryWrapper
      * @return
      */
+    List<ListDto> queryStudyList(@Param("ew") Wrapper<Mjy> queryWrapper);
+
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
     List<ListDto> queryList(@Param("ew") Wrapper<Mjy> queryWrapper);
 
     /**

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

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

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

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

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

@@ -24,6 +24,14 @@ public interface IGyzjService extends IService
      * @param form 给药制剂
      * @return 给药制剂集合
      */
+    public List<ListDto> queryStudyList(SearchForm form);
+
+    /**
+     * 查询给药制剂列表
+     *
+     * @param form 给药制剂
+     * @return 给药制剂集合
+     */
     public List<ListDto> queryList(SearchForm form);
 
     /**

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

@@ -23,6 +23,14 @@ public interface IMjyService extends IService {
      * @param form 麻精药
      * @return 麻精药集合
      */
+    public List<ListDto> queryStudyList(SearchForm form);
+
+    /**
+     * 查询麻精药列表
+     *
+     * @param form 麻精药
+     * @return 麻精药集合
+     */
     public List<ListDto> queryList(SearchForm form);
 
     /**

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

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

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

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

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

@@ -58,6 +58,40 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      * @return 暂存柜
      */
     @Override
+    public List<ListDto> queryStudyList(SearchForm form) {
+        QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
+        queryWrapper.eq("ts.del_flag", "0");
+        queryWrapper.eq("ts.study_id", form.getStudyId());
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getZjzt() != null && form.getZjzt().intValue() > 0) {
+            queryWrapper.eq("t.zjzt", form.getZjzt());
+        }
+        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.getStartDate())) {
+            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+        }
+        if (StringUtils.isNoneBlank(form.getEndDate())) {
+            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+        }
+        queryWrapper.orderByDesc("ts.id");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
+
+    /**
+     * 列表
+     *
+     * @param form 暂存柜
+     * @return 暂存柜
+     */
+    @Override
     public List<ListDto> queryList(SearchForm form) {
         QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");

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

@@ -58,6 +58,39 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      * @return 暂存柜
      */
     @Override
+    public List<ListDto> queryStudyList(SearchForm form) {
+        QueryWrapper<Mjy> queryWrapper = Wrappers.query();
+        queryWrapper.eq("ts.del_flag", "0");
+        queryWrapper.eq("ts.study_id", form.getStudyId());
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getZjzt() != null && form.getZjzt().intValue() > 0) {
+            queryWrapper.eq("t.zjzt", form.getZjzt());
+        }
+        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.getStartDate())) {
+            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+        }
+        if (StringUtils.isNoneBlank(form.getEndDate())) {
+            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+        }
+        queryWrapper.orderByDesc("ts.id");
+        return baseMapper.queryStudyList(queryWrapper);
+    }
+
+    /**
+     * 列表
+     *
+     * @param form 暂存柜
+     * @return 暂存柜
+     */
+    @Override
     public List<ListDto> queryList(SearchForm form) {
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");

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

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

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

@@ -5,10 +5,11 @@
 <mapper namespace="com.hxhq.business.mapper.GyzjFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw
-        ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,s.name as mdMc
         ,z.mc as zcgMc
         FROM `t_gyzj_ffjl` t
-        left join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_study` s on s.id=t.md_id
+        join  `t_zcg` z on z.id=t.zcg_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

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

@@ -12,10 +12,23 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.ListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt
-        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as mdMc
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,s.name as mdMc
         ,z.mc as zcgMc
         FROM `t_gyzj` t
-        left join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_study` s on s.id=t.md_id
+        join  `t_zcg` z on z.id=t.zcg_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+
+    <select id="queryStudyList" resultType="com.hxhq.business.dto.gyzj.ListDto">
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,s.name as mdMc
+        FROM `t_study_mjy` ts
+        join  `t_gyzj` t on t.id=ts.resource_id
+        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

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

@@ -5,10 +5,11 @@
 <mapper namespace="com.hxhq.business.mapper.MjyFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw
-        ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,s.name as mdMc
         ,z.mc as zcgMc
         FROM `t_mjy_ffjl` t
-        left join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

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

@@ -12,10 +12,24 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.ListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt
-        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as mdMc
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,s.name as mdMc
         ,z.mc as zcgMc
         FROM `t_mjy` t
-        left join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_zcg` z on z.id=t.zcg_id
+        join  `t_study` s on s.id=t.md_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+
+
+    <select id="queryStudyList" resultType="com.hxhq.business.dto.mjy.ListDto">
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,s.name as mdMc
+        FROM `t_study_mjy` ts
+        join  `t_mjy` t on t.id=ts.resource_id
+        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

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

@@ -7,7 +7,7 @@
         select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,t.sfbl,
                tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         FROM `t_study_form_apply` t
-        left join t_template tm on tm.id=t.template_id
+        join t_template tm on tm.id=t.template_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -19,8 +19,8 @@
         select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_apply` t
-        left join t_template tm on tm.id=t.template_id
-        left join t_study ts on ts.id=t.study_id
+        join t_template tm on tm.id=t.template_id
+        join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>

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

@@ -6,7 +6,7 @@
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPlanListDto">
         select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn
         FROM `t_study_form_plan` t
-        left join t_template tm on tm.id=t.template_id
+        join t_template tm on tm.id=t.template_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -18,8 +18,8 @@
         select t.*,tm.name as templateMc,tm.sn as templateSn
         ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_plan` t
-        left join t_template tm on tm.id=t.template_id
-        left join t_study ts on ts.id=t.study_id
+        join t_template tm on tm.id=t.template_id
+        join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>

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

@@ -6,7 +6,7 @@
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPreListDto">
         select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         FROM `t_study_form_pre` t
-        left join t_template tm on tm.id=t.template_id
+        join t_template tm on tm.id=t.template_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -18,8 +18,8 @@
         select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         ,ts.sn as studySn,ts.name as studyMc
         FROM `t_study_form_pre` t
-        left join t_template tm on tm.id=t.template_id
-        left join t_study ts on ts.id=t.study_id
+        join t_template tm on tm.id=t.template_id
+        join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
 </mapper>

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

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