fix：[非实验管理][麻精药]发放

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

@@ -21,6 +21,16 @@ public class StudyGyzj extends MpBaseEntity
     /** 资源id */
     private Long resourceId;
 
+    /** 试验归还状态：1：未归还；10：已归还*/
+    private Integer syghzt;
+
+    public Integer getSyghzt() {
+        return syghzt;
+    }
+
+    public void setSyghzt(Integer syghzt) {
+        this.syghzt = syghzt;
+    }
 
     public void setStudyId(Long studyId)
     {

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

@@ -21,6 +21,16 @@ public class StudyMjy extends MpBaseEntity
     /** 资源id */
     private Long resourceId;
 
+    /** 试验归还状态：1：未归还；10：已归还*/
+    private Integer syghzt;
+
+    public Integer getSyghzt() {
+        return syghzt;
+    }
+
+    public void setSyghzt(Integer syghzt) {
+        this.syghzt = syghzt;
+    }
 
     public void setStudyId(Long studyId)
     {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java

@@ -94,8 +94,16 @@ public class ListDto {
     /** 发放备注 */
     private String ffbz;
 
-    /** 目的名称*/
-    private String mdMc;
+    /** 试验归还状态：1：未归还；10：已归还*/
+    private Integer syghzt;
+
+    public Integer getSyghzt() {
+        return syghzt;
+    }
+
+    public void setSyghzt(Integer syghzt) {
+        this.syghzt = syghzt;
+    }
 
     public Integer getGhzt() {
         return ghzt;
@@ -185,14 +193,6 @@ public class ListDto {
         this.ffbz = ffbz;
     }
 
-    public String getMdMc() {
-        return mdMc;
-    }
-
-    public void setMdMc(String mdMc) {
-        this.mdMc = mdMc;
-    }
-
     public Integer getRqzt() {
         return rqzt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java

@@ -97,6 +97,16 @@ public class ListDto {
     /** 目的名称*/
     private String mdMc;
 
+    /** 试验归还状态：1：未归还；10：已归还*/
+    private Integer syghzt;
+
+    public Integer getSyghzt() {
+        return syghzt;
+    }
+
+    public void setSyghzt(Integer syghzt) {
+        this.syghzt = syghzt;
+    }
     public Integer getGhzt() {
         return ghzt;
     }

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

@@ -2,6 +2,10 @@ package com.hxhq.business.mapper;
 
 import com.hxhq.business.domain.StudyGyzj;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 试验-物资信息-给药制剂Mapper接口
  *
@@ -11,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface StudyGyzjMapper extends BaseMapper<StudyGyzj>
 {
 
+    void insertBatch(@Param("list") List<StudyGyzj> list);
+
+    void returnBatch(@Param("resourceId") Long resourceId);
 }

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

@@ -1,7 +1,12 @@
 package com.hxhq.business.mapper;
 
+import com.hxhq.business.domain.StudyGyzj;
 import com.hxhq.business.domain.StudyMjy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 试验-物资信息-麻精药Mapper接口
  *
@@ -11,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface StudyMjyMapper extends BaseMapper<StudyMjy>
 {
 
+    void insertBatch(@Param("list") List<StudyMjy> list);
+
+    void returnBatch(@Param("resourceId") Long resourceId);
+
 }

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

@@ -1,8 +1,10 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
 import com.hxhq.business.domain.StudyGyzj;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 试验-物资信息-给药制剂Service接口
@@ -10,7 +12,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author hxhq
  * @date 2026-01-09
  */
-public interface IStudyGyzjService extends IService<StudyGyzj>
-{
+public interface IStudyGyzjService extends IService<StudyGyzj> {
+
+    /**
+     * 批量新增
+     *
+     * @param list
+     */
+    public void insertBatch(List<StudyGyzj> list);
 
+    /**
+     * 批量归还
+     *
+     * @param resourceId
+     */
+    public void returnBatch(Long resourceId);
 }

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

@@ -1,6 +1,8 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
+import com.hxhq.business.domain.StudyGyzj;
 import com.hxhq.business.domain.StudyMjy;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IStudyMjyService extends IService<StudyMjy>
 {
- 
+    /**
+     * 批量新增
+     *
+     * @param list
+     */
+    public void insertBatch(List<StudyMjy> list);
+
+    /**
+     * 批量归还
+     *
+     * @param resourceId
+     */
+    public void returnBatch(Long resourceId);
 }

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

@@ -412,13 +412,13 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh( GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2) {
+    public void gh(GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2) {
         GyzjFfjl gyzjFfjl = this.queryLastInfoByGyzjId(form.getId());
         if (gyzjFfjl == null) {
             throw new ServiceException("发放记录不存在或已删除");
         }
+        //region 更新发放记录
         BigDecimal syl = new BigDecimal(gyzj.getKc()).subtract(new BigDecimal(form.getRkl()));
-
         gyzjFfjl.setFfzytj(form.getGhzytj());
         gyzjFfjl.setRkwz(form.getRkwz());
         gyzjFfjl.setRktj(form.getRktj());
@@ -441,6 +441,12 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setJsr2Mc(jsr2.getNickName());
         gyzjFfjl.setGhbz(form.getRemark());
         this.updateById(gyzjFfjl);
+        //endregion
+
+        //region 归还试验物资
+        studyGyzjService.returnBatch(gyzj.getId());
+        //endregion
+
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());
@@ -454,7 +460,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        gyzjFfjlJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
 
@@ -466,6 +472,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Transactional(rollbackFor = Exception.class)
     public void ff( String zytj, String remark, String mdIds,String mdMcs,String mdOther, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
+        //region 新增发放记录
         GyzjFfjl gyzjFfjl = new GyzjFfjl();
         gyzjFfjl.setGyzjId(gyzj.getId());
         gyzjFfjl.setMc(gyzj.getMc());
@@ -494,16 +501,24 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setMdIds(mdIds);
         gyzjFfjl.setMdOther(mdOther);
         this.save(gyzjFfjl);
-        //新增试验物资
+        //endregion
+
+        //region 新增试验物资
         if(StringUtils.isNoneBlank(mdIds)){
+            List<StudyGyzj> studyGyzjs=new ArrayList<>();
             String [] tmp=mdIds.split(",");
             for(String s :tmp){
                 StudyGyzj studyGyzj=new StudyGyzj();
                 studyGyzj.setStudyId(Long.parseLong(s));
                 studyGyzj.setResourceId(gyzj.getId());
-                studyGyzjService.save(studyGyzj);
+                studyGyzjs.add(studyGyzj);
+            }
+            if(studyGyzjs.size()>0){
+                studyGyzjService.insertBatch(studyGyzjs);
             }
         }
+        //endregion
+
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
@@ -515,7 +530,6 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
 
-
     }
 
     /**

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

@@ -1261,7 +1261,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         this.updateById(gyzjOld);
     }
 
-
     /**
      * 验证密码
      * @param user

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

@@ -4,14 +4,15 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.Mjy;
-import com.hxhq.business.domain.MjyFfjlJcgj;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.mjy.FfjlDetailDto;
 import com.hxhq.business.dto.mjy.FfjlListDto;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.mjy.*;
 import com.hxhq.business.service.IMjyFfjlJcgjService;
+import com.hxhq.business.service.IStudyGyzjService;
+import com.hxhq.business.service.IStudyMjyService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
@@ -22,7 +23,6 @@ import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyFfjlMapper;
-import com.hxhq.business.domain.MjyFfjl;
 import com.hxhq.business.service.IMjyFfjlService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +40,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     private ISysUserService sysUserService;
     @Autowired
     private IMjyFfjlJcgjService mjyFfjlJcgjService;
+    @Autowired
+    private IStudyMjyService studyMjyService;
 
     /**
      * 详情
@@ -412,6 +414,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         if (mjyFfjl == null) {
             throw new ServiceException("发放记录不存在或已删除");
         }
+        //region 新增发放记录
+
         mjyFfjl.setFfzytj(form.getGhzytj());
         mjyFfjl.setRkwz(form.getRkwz());
         mjyFfjl.setRktj(form.getRktj());
@@ -434,6 +438,12 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setJsr2Mc(jsr2.getNickName());
         mjyFfjl.setGhbz(form.getRemark());
         this.updateById(mjyFfjl);
+        //endregion
+
+        //region 归还试验物资
+        studyMjyService.returnBatch(mjy.getId());
+        //endregion
+
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());
@@ -460,6 +470,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Transactional(rollbackFor = Exception.class)
     public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
+        //region 新增发放记录
+
         MjyFfjl mjyFfjl = new MjyFfjl();
         mjyFfjl.setMjyId(mjy.getId());
         mjyFfjl.setMc(mjy.getMc());
@@ -487,6 +499,23 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setFfbz(remark);
         mjyFfjl.setMdIds(mdIds);
         this.save(mjyFfjl);
+        //endregion
+
+        //region 新增试验物资
+        if(StringUtils.isNoneBlank(mdIds)){
+            List<StudyMjy> studyMjies=new ArrayList<>();
+            String [] tmp=mdIds.split(",");
+            for(String s :tmp){
+                StudyMjy studyMjy=new StudyMjy();
+                studyMjy.setStudyId(Long.parseLong(s));
+                studyMjy.setResourceId(mjy.getId());
+                studyMjies.add(studyMjy);
+            }
+            if(studyMjies.size()>0){
+                studyMjyService.insertBatch(studyMjies);
+            }
+        }
+        //endregion
 
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();

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

@@ -774,7 +774,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能发放");
         }
         Date now = new Date();
+        
+        //region 发放记录，试验物资
         mjyFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),mjyOld,lqr1,lqr2,ffr1,ffr2,now);
+        //endregion
+
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", mjyOld.getKc()+ mjyOld.getKcdw());
@@ -785,11 +789,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
+
         //region 台账
         mjyTzService.saveTz(mjyOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "",
                 ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "",
                 "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark());
         //endregion
+
         //region 更新发放信息
         mjyOld.setCkl(mjyOld.getKc());
         mjyOld.setCkldw(mjyOld.getKcdw());

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

@@ -1,9 +1,10 @@
 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 com.hxhq.common.core.utils.DateUtils;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyGyzjMapper;
 import com.hxhq.business.domain.StudyGyzj;
@@ -17,7 +18,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2026-01-09
  */
 @Service
-public class StudyGyzjServiceImpl extends ServiceImpl<StudyGyzjMapper, StudyGyzj> implements IStudyGyzjService
-{
+public class StudyGyzjServiceImpl extends ServiceImpl<StudyGyzjMapper, StudyGyzj> implements IStudyGyzjService {
+
+    /**
+     * 批量新增
+     *
+     * @param list
+     */
+    @Override
+    public void insertBatch(List<StudyGyzj> list) {
+        baseMapper.insertBatch(list);
+    }
+
 
+    /**
+     * 批量归还
+     *
+     * @param resourceId
+     */
+    @Override
+    public void returnBatch(Long resourceId){
+        baseMapper.returnBatch(resourceId);
+    }
 }

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

@@ -1,9 +1,11 @@
 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 com.hxhq.business.domain.StudyGyzj;
+import com.hxhq.common.core.utils.DateUtils;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyMjyMapper;
 import com.hxhq.business.domain.StudyMjy;
@@ -17,8 +19,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2026-01-09
  */
 @Service
-public class StudyMjyServiceImpl extends ServiceImpl<StudyMjyMapper, StudyMjy> implements IStudyMjyService
-{
+public class StudyMjyServiceImpl extends ServiceImpl<StudyMjyMapper, StudyMjy> implements IStudyMjyService {
+    /**
+     * 批量新增
+     *
+     * @param list
+     */
+    @Override
+    public void insertBatch(List<StudyMjy> list) {
+        baseMapper.insertBatch(list);
+    }
+
 
+    /**
+     * 批量归还
+     *
+     * @param resourceId
+     */
+    @Override
+    public void returnBatch(Long resourceId) {
+        baseMapper.returnBatch(resourceId);
+    }
 
 }

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

@@ -27,7 +27,7 @@
     </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.ghzt,t.zjzt
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,ts.syghzt
         FROM `t_study_gyzj` ts
         join  `t_gyzj` t on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.MjyMapper">
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.mjy.DetailDto">
-        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdssrMc,
+        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdgsrMc,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy` t
         left join  `t_study` s on s.id=t.study_id
@@ -27,7 +27,7 @@
     </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
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,ts.syghzt
         FROM `t_study_mjy` ts
         join  `t_mjy` t on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">

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

@@ -3,4 +3,19 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyGyzjMapper">
+
+    <insert id="insertBatch">
+        insert  into `t_study_gyzj`(
+        `study_id`,
+        `resource_id`) values
+        <foreach collection="list" close="" index="index" item="item" open="" separator=",">
+            (#{item.studyId},
+            #{item.resourceId})
+        </foreach>
+    </insert>
+
+    <update id="returnBatch" >
+        update  t_study_gyzj set syghzt=10 where resource_id=#{resourceId};
+    </update>
+
 </mapper>

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

@@ -3,4 +3,17 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyMjyMapper">
+    <insert id="insertBatch">
+        insert  into `t_study_mjy`(
+        `study_id`,
+        `resource_id`) values
+        <foreach collection="list" close="" index="index" item="item" open="" separator=",">
+            (#{item.studyId},
+            #{item.resourceId})
+        </foreach>
+    </insert>
+
+    <update id="returnBatch" >
+        update  t_study_mjy set syghzt=10 where resource_id=#{resourceId};
+    </update>
 </mapper>