From 91116fb81fe7aec9a685c1786b24886cac11e0a0 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Fri, 9 Jan 2026 16:25:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E7=A8=BD=E6=9F=A5=E8=BD=A8=E8=BF=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=BA=BA=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/domain/StudyJcgj.java | 10 +++++++++ .../com/hxhq/business/form/common/SignForm.java | 12 +++++++++++ .../hxhq/business/service/IStudyJcgjService.java | 3 ++- .../service/impl/StudyJcgjServiceImpl.java | 3 ++- .../business/service/impl/StudyServiceImpl.java | 25 +++++++++++----------- .../service/impl/StudySubjectServiceImpl.java | 2 +- .../service/impl/StudySubjectUserServiceImpl.java | 4 ++-- 7 files changed, 42 insertions(+), 17 deletions(-) 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 78b4c5c..81096e8 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,6 +36,9 @@ public class StudyJcgj extends MpBaseEntity /** 签名人名称 */ private String qmrMc; + /** 签名人用户名 */ + private String qmrUserName; + public void setStudyId(Long studyId) { @@ -103,4 +106,11 @@ 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/form/common/SignForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java index 30fb0ca..9b21c00 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,6 +22,10 @@ public class SignForm { */ private String qmrMc; /** + * 签名人用户名 + */ + private String qmrUserName; + /** * 签名密码 */ private String qmrmm; @@ -68,6 +72,14 @@ 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/service/IStudyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java index 2ba5f11..1288c12 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,8 +31,9 @@ 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 remark); + void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys,String jcmc,String jcnr,Long qmrId,String qmrMc,String qmrUserName,String remark); } 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 1887dd1..c89b9ff 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); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null,null); }else{ checkPassword(sign); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } }else{ //修改 @@ -220,6 +220,7 @@ 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); @@ -233,21 +234,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); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), null,null,null,null); }else{ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),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); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,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(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } } updateById(study); @@ -269,7 +270,7 @@ public class StudyServiceImpl extends ServiceImpl implements } checkPermit(info); checkPassword(sign); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); removeById(study.getId()); } @@ -297,7 +298,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(),sign.getRemark()); + studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"锁定实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } @Override @@ -317,7 +318,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(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } @Override @@ -337,7 +338,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(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } @Override @@ -357,7 +358,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(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark()); } @Override @@ -379,7 +380,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(),sign.getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),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 1fb2bb5..6744705 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(),form.getSign().getRemark()); + studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),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 db6b6bf..3947807 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(),form.getSign().getRemark()); + studyJcgjService.saveInfo(studySubject.getStudyId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),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(),signRemark); + studyJcgjService.saveInfo(studyId, JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),signRemark); } } remove(queryWrapper);