diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java index 6c7580b..74568dc 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java @@ -210,7 +210,7 @@ public class StudyServiceImpl extends ServiceImpl implements 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.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, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } @@ -257,7 +257,7 @@ public class StudyServiceImpl extends ServiceImpl implements }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.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, JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign); } @@ -281,7 +281,7 @@ public class StudyServiceImpl extends ServiceImpl implements StudyJcgj jcgj = new StudyJcgj(); jcgj.setStudyId(study.getId()); jcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); - jcgj.setJcmc("修改试验"); + jcgj.setJcmc(old.getType().equals(StudyTypeEnum.sy.getValue())?"修改试验":old.getType().equals(StudyTypeEnum.fsy.getValue())?"修改非试验":"修改麻精药文件夹"); jcgj.setJcmcEn("Change of Information"); jcgj.setJcmcys(JcmcysEnum.orange.getValue()); @@ -346,7 +346,7 @@ public class StudyServiceImpl extends ServiceImpl implements checkPermit(study); String name = baseMapper.queryNotFinishFormName(study.getId()); if(StringUtils.isNoneBlank(name)){ - throw new ServiceException("该实验下"+name+"还未结束,请先完成该表单后再进行锁定试验"); + throw new ServiceException("该试验下"+name+"还未结束,请先完成该表单后再进行锁定试验"); } }