From 6f800c33283d6f3d4defedd9bda5619dada36f09 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 9 Jan 2026 18:05:36 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E7=89=A9=E8=B5=84=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/domain/GyzjFfjl.java | 11 ++++++++++ .../com/hxhq/business/domain/GyzjFfjlJcgj.java | 4 ++-- .../java/com/hxhq/business/domain/StudyJcgj.java | 10 --------- .../com/hxhq/business/dto/gyzj/FfjlDetailDto.java | 10 +++++++++ .../com/hxhq/business/dto/gyzj/FfjlListDto.java | 22 +++++++++++++++++++ .../com/hxhq/business/form/common/SignForm.java | 12 ----------- .../java/com/hxhq/business/form/gyzj/FfForm.java | 10 ++++----- .../java/com/hxhq/business/form/gyzj/PlffItem.java | 10 ++++----- .../hxhq/business/service/IGyzjFfjlService.java | 6 ++---- .../hxhq/business/service/IStudyJcgjService.java | 3 +-- .../business/service/impl/GyzjFfjlServiceImpl.java | 11 +++++----- .../business/service/impl/GyzjJcgjServiceImpl.java | 6 +++--- .../business/service/impl/GyzjServiceImpl.java | 18 ++++++++++------ .../service/impl/StudyJcgjServiceImpl.java | 3 +-- .../business/service/impl/StudyServiceImpl.java | 25 +++++++++++----------- .../service/impl/StudySubjectServiceImpl.java | 2 +- .../service/impl/StudySubjectUserServiceImpl.java | 4 ++-- .../resources/mapper/business/GyzjFfjlMapper.xml | 11 +++++----- .../main/resources/mapper/business/GyzjMapper.xml | 2 +- 19 files changed, 102 insertions(+), 78 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index cb9900f..69ade8e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -98,6 +98,9 @@ public class GyzjFfjl extends MpBaseEntity /** 目的ids */ private String mdIds; + /** 发放目的其他 */ + private String mdOther; + /** 入库位置 */ private String rkwz; @@ -178,6 +181,14 @@ public class GyzjFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public String getMdOther() { + return mdOther; + } + + public void setMdOther(String mdOther) { + this.mdOther = mdOther; + } + public String getRkmz() { return rkmz; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java index 9baad9c..c8edb44 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java @@ -5,12 +5,12 @@ import com.hxhq.common.core.domain.MpBaseEntity; /** - * 麻精药发放记录-稽查轨迹对象 t_mjy_ffjl_jcgj + * 发放记录-稽查轨迹对象 t_gyzj_ffjl_jcgj * * @author hxhq * @date 2025-12-25 */ -@TableName("t_mjy_ffjl_jcgj") +@TableName("t_gyzj_ffjl_jcgj") public class GyzjFfjlJcgj extends MpBaseEntity { private static final long serialVersionUID = 1L; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java index 81096e8..78b4c5c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java @@ -36,9 +36,6 @@ public class StudyJcgj extends MpBaseEntity /** 签名人名称 */ private String qmrMc; - /** 签名人用户名 */ - private String qmrUserName; - public void setStudyId(Long studyId) { @@ -106,11 +103,4 @@ public class StudyJcgj extends MpBaseEntity return qmrMc; } - public String getQmrUserName() { - return qmrUserName; - } - - public void setQmrUserName(String qmrUserName) { - this.qmrUserName = qmrUserName; - } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java index 023c1e8..f5695e4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlDetailDto.java @@ -7,5 +7,15 @@ import com.hxhq.business.domain.GyzjFfjl; */ public class FfjlDetailDto extends GyzjFfjl { + /** 发放目的名称 */ + private String mdMcs; + + public String getMdMcs() { + return mdMcs; + } + + public void setMdMcs(String mdMcs) { + this.mdMcs = mdMcs; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java index dae814f..535c552 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java @@ -88,6 +88,28 @@ public class FfjlListDto { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Long jyzt; + /** 发放目的名称 */ + private String mdMcs; + + /** 发放目的其他 */ + private String mdOther; + + public String getMdOther() { + return mdOther; + } + + public void setMdOther(String mdOther) { + this.mdOther = mdOther; + } + + public String getMdMcs() { + return mdMcs; + } + + public void setMdMcs(String mdMcs) { + this.mdMcs = mdMcs; + } + public String getRkmz() { return rkmz; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java index 9b21c00..30fb0ca 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java @@ -22,10 +22,6 @@ public class SignForm { */ private String qmrMc; /** - * 签名人用户名 - */ - private String qmrUserName; - /** * 签名密码 */ private String qmrmm; @@ -72,14 +68,6 @@ public class SignForm { this.qmrMc = qmrMc; } - public String getQmrUserName() { - return qmrUserName; - } - - public void setQmrUserName(String qmrUserName) { - this.qmrUserName = qmrUserName; - } - public String getQmrmm() { return qmrmm; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java index 2708dec..384e421 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java @@ -21,7 +21,7 @@ public class FfForm { private String mdMcs; /** 目的其他 */ - private String mdOthers; + private String mdOther; /** 出库毛重 */ private String ckmz; @@ -61,12 +61,12 @@ public class FfForm { this.mdMcs = mdMcs; } - public String getMdOthers() { - return mdOthers; + public String getMdOther() { + return mdOther; } - public void setMdOthers(String mdOthers) { - this.mdOthers = mdOthers; + public void setMdOther(String mdOther) { + this.mdOther = mdOther; } public String getCkmzdw() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java index 347734d..2d586f2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java @@ -21,7 +21,7 @@ public class PlffItem { private String mdMcs; /** 目的其他 */ - private String mdOthers; + private String mdOther; /** 出库毛重 */ private String ckmz; @@ -37,12 +37,12 @@ public class PlffItem { this.mdMcs = mdMcs; } - public String getMdOthers() { - return mdOthers; + public String getMdOther() { + return mdOther; } - public void setMdOthers(String mdOthers) { - this.mdOthers = mdOthers; + public void setMdOther(String mdOther) { + this.mdOther = mdOther; } public String getCkmzdw() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 66b8b31..2c2a28d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -116,13 +116,11 @@ public interface IGyzjFfjlService extends IService { /** * 发放 - * @param ckmz - * @param ckmzdw * @param zytj * @param remark * @param mdIds * @param mdMcs - * @param mdOthers + * @param mdOther * @param gyzj * @param lqr1 * @param lqr2 @@ -130,6 +128,6 @@ public interface IGyzjFfjlService extends IService { * @param ffr2 * @param time */ - public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); + 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); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java index 1288c12..2ba5f11 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java @@ -31,9 +31,8 @@ public interface IStudyJcgjService extends IService * @param jcnr * @param qmrId * @param qmrMc - * @param qmrUserName * @param remark */ - void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys,String jcmc,String jcnr,Long qmrId,String qmrMc,String qmrUserName,String remark); + void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys,String jcmc,String jcnr,Long qmrId,String qmrMc,String remark); } 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 98bfd46..d0fc1b3 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 @@ -461,7 +461,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i */ @Override @Transactional(rollbackFor = Exception.class) - public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) { + 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) { GyzjFfjl gyzjFfjl = new GyzjFfjl(); gyzjFfjl.setGyzjId(gyzj.getId()); @@ -475,8 +475,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setCctj(gyzj.getCctj()); gyzjFfjl.setCkl(gyzj.getKc()); gyzjFfjl.setCkldw(gyzj.getKcdw()); - gyzjFfjl.setCkmz(ckmz); - gyzjFfjl.setCkmzdw(ckmzdw); + gyzjFfjl.setCkmz(gyzj.getCkl()); + gyzjFfjl.setCkmzdw(gyzj.getKcdw()); gyzjFfjl.setLqr1Id(lqr1.getUserId()); gyzjFfjl.setLqr2Id(lqr2.getUserId()); gyzjFfjl.setFfr1Id(ffr1.getUserId()); @@ -489,6 +489,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setFfrq(time); gyzjFfjl.setFfbz(remark); gyzjFfjl.setMdIds(mdIds); + gyzjFfjl.setMdOther(mdOther); this.save(gyzjFfjl); //新增试验物资 if(StringUtils.isNoneBlank(mdIds)){ @@ -504,8 +505,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); formData.put("转移条件", zytj); - formData.put("出库净重", ckmz + gyzj.getKcdw()); - formData.put("目的", mdMcs+mdOthers); + formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw()); + formData.put("目的", mdMcs); formData.put("备注", remark); gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index 22ee5ae..01447ee 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -14,7 +14,7 @@ import com.hxhq.business.service.IGyzjJcgjService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * 麻精药-稽查轨迹Service业务层处理 + * -稽查轨迹Service业务层处理 * * @author hxhq * @date 2025-12-18 @@ -32,7 +32,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i public List queryList(GyzjJcgj gyzjJcgj){ QueryWrapper queryWrapper = Wrappers.query(); if(gyzjJcgj.getGyzjId()==null||gyzjJcgj.getGyzjId().longValue()<0){ - throw new ServiceException("麻精药id不能为空"); + throw new ServiceException("id不能为空"); } queryWrapper.eq("gyzj_id",gyzjJcgj.getGyzjId()); if(gyzjJcgj.getJcgjlx()!=null&&gyzjJcgj.getJcgjlx().intValue()>0){ @@ -48,7 +48,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i /** * 新增稽查轨迹 - * @param gyzjId 麻精药id + * @param gyzjId id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 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 3005e17..39947e1 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 @@ -765,22 +765,28 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能发放"); } Date now = new Date(); - gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOthers(), gyzjOld, lqr1, lqr2, ffr1, ffr2, now); + + //region 发放记录，试验物资 + gyzjFfjlService.ff( form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOther(),gyzjOld, lqr1, lqr2, ffr1, ffr2, now); + //endregion + //region 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库净重", form.getCkmz() + gyzjOld.getKcdw()); - formData.put("目的", form.getMdIds()); + formData.put("出库净重", gyzjOld.getKc() + gyzjOld.getKcdw()); + formData.put("目的", form.getMdMcs()); formData.put("备注", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //endregion + //region 台账 gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); //endregion + //region 更新发放信息 gyzjOld.setCkl(gyzjOld.getKc()); gyzjOld.setCkldw(gyzjOld.getKcdw()); @@ -799,7 +805,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setFfrq(now); gyzjOld.setFfbz(form.getRemark()); gyzjOld.setMdIds(form.getMdIds()); - gyzjOld.setMdOther(form.getMdOthers()); + gyzjOld.setMdOther(form.getMdOther()); gyzjOld.setZjzt(ZjztEnum.yff.getValue()); //endregion @@ -847,7 +853,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { - gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(), plffItemFilter.get(0).getCkmzdw(), plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOthers(), gyzj, lqr1, lqr2, ffr1, ffr2, now); + gyzjFfjlService.ff( plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOther(), gyzj, lqr1, lqr2, ffr1, ffr2, now); //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzj.getId()); @@ -894,7 +900,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setFfrq(now); gyzj.setFfbz(plffItemFilter.get(0).getRemark()); gyzj.setMdIds(plffItemFilter.get(0).getMdIds()); - gyzj.setMdOther(plffItemFilter.get(0).getMdOthers()); + gyzj.setMdOther(plffItemFilter.get(0).getMdOther()); gyzj.setZjzt(ZjztEnum.yff.getValue()); //endregion } else { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java index c89b9ff..1887dd1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java @@ -50,7 +50,7 @@ public class StudyJcgjServiceImpl extends ServiceImpl implements if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ Map formData = new LinkedHashMap<>(); formData.put("暂存人", SecurityUtils.getNickName()); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null,null); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null); }else{ checkPassword(sign); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } }else{ //修改 @@ -220,7 +220,6 @@ public class StudyServiceImpl extends ServiceImpl implements if(study.getStatus().equals(StudyStatusEnum.syz.getValue())){ jcgj.setQmrId(SecurityUtils.getUserId()); jcgj.setQmrMc(SecurityUtils.getNickName()); - jcgj.setQmrUserName(SecurityUtils.getUsername()); jcgj.setRemark(sign.getRemark()); } jcgjList.add(jcgj); @@ -234,21 +233,21 @@ public class StudyServiceImpl extends ServiceImpl implements formData.put("新增人员", study.getLeaderName()); formData.put("删除人员", old.getLeaderName()); if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), null,null,null,null); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), null,null,null); }else{ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } } if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ Map formData = new LinkedHashMap<>(); formData.put("暂存人", SecurityUtils.getNickName()); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null,null); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null); }else { checkPassword(sign); if(old.getStatus().equals(StudyStatusEnum.cg.getValue())){ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } } updateById(study); @@ -270,7 +269,7 @@ public class StudyServiceImpl extends ServiceImpl implements } checkPermit(info); checkPassword(sign); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); removeById(study.getId()); } @@ -298,7 +297,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPassword(sign); info.setStatus(StudyStatusEnum.ysd.getValue()); updateById(info); - studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"锁定实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"锁定实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } @Override @@ -318,7 +317,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPassword(sign); info.setStatus(StudyStatusEnum.syz.getValue()); updateById(info); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } @Override @@ -338,7 +337,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPassword(sign); info.setStatus(StudyStatusEnum.dgd.getValue()); updateById(info); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } @Override @@ -358,7 +357,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPassword(sign); info.setStatus(StudyStatusEnum.djd.getValue()); updateById(info); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } @Override @@ -380,7 +379,7 @@ public class StudyServiceImpl extends ServiceImpl implements info.setBorrowStartDate(sign.getStartDate()); info.setBorrowEndDate(sign.getEndDate()); updateById(info); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); } @Override diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java index 6744705..1fb2bb5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java @@ -179,7 +179,7 @@ public class StudySubjectServiceImpl extends ServiceImpl0){ formData.put("删除人员", String.join("，",deleteNameList)); } - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),form.getSign().getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getSign().getRemark()); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java index 3947807..db6b6bf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java @@ -112,7 +112,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ formData.put("删除人员", String.join("，",deleteNameList)); } - studyJcgjService.saveInfo(studySubject.getStudyId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),form.getSign().getRemark()); + studyJcgjService.saveInfo(studySubject.getStudyId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getSign().getRemark()); } } @@ -126,7 +126,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ Map formData = new LinkedHashMap<>(); formData.put("删除人员", String.join("，",deleteNameList)); - studyJcgjService.saveInfo(studyId, JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),signRemark); + studyJcgjService.saveInfo(studyId, JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),signRemark); } } remove(queryWrapper); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index a7cdf8a..78a9c85 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -5,11 +5,11 @@ 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 051794e..56a65ba 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 @@ -5,7 +5,7 @@