From db2e3008704daf350043c4453c25a3295fb08432 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 9 Jan 2026 21:16:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E9=9D=9E=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF]=E5=8F=91?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/domain/StudyGyzj.java | 10 +++++++ .../java/com/hxhq/business/domain/StudyMjy.java | 10 +++++++ .../java/com/hxhq/business/dto/gyzj/ListDto.java | 20 ++++++------- .../java/com/hxhq/business/dto/mjy/ListDto.java | 10 +++++++ .../com/hxhq/business/mapper/StudyGyzjMapper.java | 7 +++++ .../com/hxhq/business/mapper/StudyMjyMapper.java | 9 ++++++ .../hxhq/business/service/IStudyGyzjService.java | 18 +++++++++-- .../hxhq/business/service/IStudyMjyService.java | 16 +++++++++- .../business/service/impl/GyzjFfjlServiceImpl.java | 26 ++++++++++++---- .../business/service/impl/GyzjServiceImpl.java | 1 - .../business/service/impl/MjyFfjlServiceImpl.java | 35 ++++++++++++++++++++-- .../hxhq/business/service/impl/MjyServiceImpl.java | 6 ++++ .../service/impl/StudyGyzjServiceImpl.java | 26 ++++++++++++++-- .../business/service/impl/StudyMjyServiceImpl.java | 26 ++++++++++++++-- .../main/resources/mapper/business/GyzjMapper.xml | 2 +- .../main/resources/mapper/business/MjyMapper.xml | 4 +-- .../resources/mapper/business/StudyGyzjMapper.xml | 15 ++++++++++ .../resources/mapper/business/StudyMjyMapper.xml | 13 ++++++++ 18 files changed, 222 insertions(+), 32 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java index f66ae70..0ab8b31 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java +++ b/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) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java index 8c6b82c..17a93a1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java +++ b/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) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java index 3bde553..2712c1b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java +++ b/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; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java index b76dfc9..8b541d7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java +++ b/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; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java index 7d998ba..5ad41ed 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java +++ b/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 { + void insertBatch(@Param("list") List list); + + void returnBatch(@Param("resourceId") Long resourceId); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java index c37db58..88ca1d7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java +++ b/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 { + void insertBatch(@Param("list") List list); + + void returnBatch(@Param("resourceId") Long resourceId); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java index 29babc5..1a4bc2b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java +++ b/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 -{ +public interface IStudyGyzjService extends IService { + + /** + * 批量新增 + * + * @param list + */ + public void insertBatch(List list); + /** + * 批量归还 + * + * @param resourceId + */ + public void returnBatch(Long resourceId); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java index 678c284..bcf1a9b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java +++ b/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 { - + /** + * 批量新增 + * + * @param list + */ + public void insertBatch(List list); + + /** + * 批量归还 + * + * @param resourceId + */ + public void returnBatch(Long resourceId); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 2d74bb8..e58e4b2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/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 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 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 formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); @@ -515,7 +530,6 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i SecurityUtils.getUserId(), SecurityUtils.getNickName()); //endregion - } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index 0fb4f7f..975f6b1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index f4c353a..4a33e59 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/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 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 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 formData = new LinkedHashMap<>(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index 024ca4d..542fabe 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/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 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()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java index d6625e9..d43e798 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java +++ b/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 implements IStudyGyzjService -{ +public class StudyGyzjServiceImpl extends ServiceImpl implements IStudyGyzjService { + + /** + * 批量新增 + * + * @param list + */ + @Override + public void insertBatch(List list) { + baseMapper.insertBatch(list); + } + + /** + * 批量归还 + * + * @param resourceId + */ + @Override + public void returnBatch(Long resourceId){ + baseMapper.returnBatch(resourceId); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java index a84eb56..490428e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java +++ b/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 implements IStudyMjyService -{ +public class StudyMjyServiceImpl extends ServiceImpl implements IStudyMjyService { + /** + * 批量新增 + * + * @param list + */ + @Override + public void insertBatch(List list) { + baseMapper.insertBatch(list); + } + + /** + * 批量归还 + * + * @param resourceId + */ + @Override + public void returnBatch(Long resourceId) { + baseMapper.returnBatch(resourceId); + } } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml index f9cbd10..d8d9ad1 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml @@ -27,7 +27,7 @@ - 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 @@