diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SystemLog.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SystemLog.java index 3249e93..278e8e5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SystemLog.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SystemLog.java @@ -15,6 +15,9 @@ public class SystemLog extends MpBaseEntity { private static final long serialVersionUID = 1L; + /** 操作对象的名称编号 */ + private String name; + /** 操作类型 */ private String jcmc; @@ -36,6 +39,13 @@ public class SystemLog extends MpBaseEntity /** 操作人名称-英文 */ private String qmrMcEn; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } public void setJcmc(String jcmc) { 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 a1a313c..fbf2e5a 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 @@ -1,6 +1,8 @@ package com.hxhq.business.service; import java.util.List; + +import com.hxhq.business.domain.Study; import com.hxhq.business.domain.StudyJcgj; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.enums.zykgl.JcgjlxEnum; @@ -25,13 +27,13 @@ public interface IStudyJcgjService extends IService /** * 保存稽查轨迹信息 - * @param studyId + * @param study * @param jcgjlx * @param jcmcys * @param jcnr * @param jcnrEn * @param signForm */ - void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcnr,String jcnrEn, SignForm signForm); + void saveInfo(Study study, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcnr, String jcnrEn, SignForm signForm); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java index 7b6827f..3ef9501 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java @@ -2,6 +2,7 @@ package com.hxhq.business.service; import java.util.List; +import com.hxhq.business.domain.Study; import com.hxhq.business.domain.StudyJcgj; import com.hxhq.business.domain.SystemLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -26,17 +27,18 @@ public interface ISystemLogService extends IService /** * 试验稽查轨迹 + * @param study * @param jcnr * @param jcnrEn * @param signForm */ - void saveStudyInfo(String jcnr, String jcnrEn, SignForm signForm); + void saveStudyInfo(Study study,String jcnr, String jcnrEn, SignForm signForm); /** * 试验稽查轨迹-批量 * @param jcgjList */ - void saveStudyBatch(List jcgjList); + void saveStudyBatch(Study study,List jcgjList); /** * 普通日志 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 40375ab..049fd45 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 @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.MjyJcgj; +import com.hxhq.business.domain.Study; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.common.SignForm; @@ -56,9 +57,9 @@ public class StudyJcgjServiceImpl extends ServiceImpl implements formDataEn.put("Save By", SecurityUtils.getNickName()); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"暂存":study.getType().equals(StudyTypeEnum.fsy.getValue())?"暂存":study.getType().equals(StudyTypeEnum.mjy.getValue())?"暂存":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Save":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Save":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Save":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn),sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.lc, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn),sign); }else{ checkPassword(sign); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"创建实验":study.getType().equals(StudyTypeEnum.fsy.getValue())?"创建非实验":study.getType().equals(StudyTypeEnum.mjy.getValue())?"创建麻精药文件夹":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Create Study":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Create":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Create":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } }else{ //修改 @@ -228,7 +228,7 @@ public class StudyServiceImpl extends ServiceImpl implements //获取修改的稽查轨迹 List jcgjList = getChangeJcgj(old,study,sign); studyJcgjService.saveBatch(jcgjList); - systemLogService.saveStudyBatch(jcgjList); + systemLogService.saveStudyBatch(study, jcgjList); if(!old.getLeaderName().equals(study.getLeaderName())){ @@ -241,9 +241,9 @@ public class StudyServiceImpl extends ServiceImpl implements sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.ry, JcmcysEnum.blue,JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), sign); }else{ - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn), sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.ry, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn), sign); } } if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ @@ -253,13 +253,13 @@ public class StudyServiceImpl extends ServiceImpl implements formDataEn.put("Save By", SecurityUtils.getNickName()); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"暂存":study.getType().equals(StudyTypeEnum.fsy.getValue())?"暂存":study.getType().equals(StudyTypeEnum.mjy.getValue())?"暂存":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Save":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Save":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Save":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn),sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.lc, JcmcysEnum.blue,JctUtil.formatStr(formData),JctUtil.formatStr(formDataEn),sign); }else { checkPassword(sign); if(old.getStatus().equals(StudyStatusEnum.cg.getValue())){ sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"创建实验":study.getType().equals(StudyTypeEnum.fsy.getValue())?"创建非实验":study.getType().equals(StudyTypeEnum.mjy.getValue())?"创建麻精药文件夹":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Create Study":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Create":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Create":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(study, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } } updateById(study); @@ -331,7 +331,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPassword(sign); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"删除试验":info.getType().equals(StudyTypeEnum.fsy.getValue())?"删除非试验":info.getType().equals(StudyTypeEnum.mjy.getValue())?"删除麻精药文件夹":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Remove Study":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Remove":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Remove":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.red,null,null,sign); removeById(study.getId()); } @@ -361,7 +361,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"锁定试验":info.getType().equals(StudyTypeEnum.fsy.getValue())?"锁定非试验":info.getType().equals(StudyTypeEnum.mjy.getValue())?"锁定麻精药文件夹":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Lock Study":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Lock Record":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Lock Record":""); - studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } @Override @@ -383,7 +383,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"解锁试验":info.getType().equals(StudyTypeEnum.fsy.getValue())?"解锁非试验":info.getType().equals(StudyTypeEnum.mjy.getValue())?"解锁麻精药文件夹":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Unlock Study":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Unlock Record":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Unlock Record":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } @Override @@ -406,7 +406,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"申请归档":info.getType().equals(StudyTypeEnum.fsy.getValue())?"申请归档":info.getType().equals(StudyTypeEnum.mjy.getValue())?"申请归档":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Apply for Archiving":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Apply for Archiving":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Apply for Archiving":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"申请归档"); } @@ -430,7 +430,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"申请解档":info.getType().equals(StudyTypeEnum.fsy.getValue())?"申请解档":info.getType().equals(StudyTypeEnum.mjy.getValue())?"申请解档":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Apply for De-archiving":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Apply for De-archiving":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Apply for De-archiving":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"申请解档"); } @@ -456,7 +456,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy(info.getType().equals(StudyTypeEnum.sy.getValue())?"申请借阅":info.getType().equals(StudyTypeEnum.fsy.getValue())?"申请借阅":info.getType().equals(StudyTypeEnum.mjy.getValue())?"申请借阅":""); sign.setQmyyEn(info.getType().equals(StudyTypeEnum.sy.getValue())?"Apply for Check-out":info.getType().equals(StudyTypeEnum.fsy.getValue())?"Apply for Check-out":info.getType().equals(StudyTypeEnum.mjy.getValue())?"Apply for Check-out":""); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"申请借阅"); } @@ -564,7 +564,7 @@ public class StudyServiceImpl extends ServiceImpl implements sign.setRemark(null); } - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.ysd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.ysd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); } private String getNoticeUrl(Study study){ @@ -608,7 +608,7 @@ public class StudyServiceImpl extends ServiceImpl implements sign.setRemark(null); } - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.gd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.gd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); } @Override @@ -648,7 +648,7 @@ public class StudyServiceImpl extends ServiceImpl implements sign.setRemark(null); } - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?JcmcysEnum.red:JcmcysEnum.blue,jcnr,jcnrEn,sign); } @Override @@ -669,7 +669,7 @@ public class StudyServiceImpl extends ServiceImpl implements updateById(info); sign.setQmyy("确认归还"); sign.setQmyyEn("Confirm Check-in"); - studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"确认归还"); @@ -693,7 +693,7 @@ public class StudyServiceImpl extends ServiceImpl implements SignForm sign = new SignForm(); sign.setQmyy("到期自动归还"); sign.setQmyyEn("Check-out End on Time"); - studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); + studyJcgjService.saveInfo(info, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"("+info.getSn()+")】提交的申请借阅已到期自动归还"; noticeService.save(title,info.getLeader(),getNoticeUrl(info)); 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 2ea9959..25bf407 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 @@ -184,7 +184,7 @@ public class StudySubjectServiceImpl extends ServiceImpl jcgjList) { + public void saveStudyBatch(Study study,List jcgjList) { List logList = new ArrayList<>(); for(StudyJcgj jcgj : jcgjList){ SystemLog info = new SystemLog(); + info.setName(study.getName()+"("+study.getSn()+")"); info.setJcnr(jcgj.getJcnr()); info.setJcnrEn(jcgj.getJcnrEn()); info.setJcmc(jcgj.getJcmc()); info.setJcmcEn(jcgj.getJcmcEn()); - info.setQmrId(jcgj.getQmrId()); - info.setQmrMc(jcgj.getQmrMc()); - info.setQmrMcEn(jcgj.getQmrMcEn()); + info.setQmrId(jcgj.getQmrId()==null? SecurityUtils.getUserId() : jcgj.getQmrId()); + info.setQmrMc(jcgj.getQmrMc()==null? SecurityUtils.getNickName() : jcgj.getQmrMc()); + info.setQmrMcEn(jcgj.getQmrMcEn()==null? SecurityUtils.getUsername() : jcgj.getQmrMcEn()); info.setRemark(jcgj.getRemark()); logList.add(info);