feat: [试验管理] 稽查轨迹增加签名人用户名

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;
+    }
 }

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;
     }

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);
 
 }

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

@@ -50,7 +50,7 @@ public class StudyJcgjServiceImpl extends ServiceImpl
     }
 
     @Override
-    public void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcmc, String jcnr, Long qmrId, String qmrMc,String remark) {
+    public void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcmc, String jcnr, Long qmrId, String qmrMc,String qmrUserName,String remark) {
         StudyJcgj info = new StudyJcgj();
         info.setStudyId(studyId);
         info.setJcgjlx(jcgjlx.getValue());
@@ -59,6 +59,7 @@ public class StudyJcgjServiceImpl extends ServiceImpl
         info.setJcnr(jcnr);
         info.setQmrId(qmrId);
         info.setQmrMc(qmrMc);
+        info.setQmrUserName(qmrUserName);
         info.setRemark(remark);
 
         save(info);

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

@@ -189,11 +189,11 @@ public class StudyServiceImpl extends ServiceImpl implements
             if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){
                 Map<String, String> 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<String, String> 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

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

@@ -179,7 +179,7 @@ public class StudySubjectServiceImpl extends ServiceImpl
             if(deleteNameList.size()>0){
                 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());
         }
     }
 

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

@@ -112,7 +112,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
             if(deleteNameList.size()>0){
                 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 ServiceImpl
             if(deleteNameList.size()>0){
                 Map<String, String> 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);