From 31cbb2e3797482351242615313a61002ca5c1e0b Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 12 Jan 2026 18:35:53 +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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/domain/Study.java | 11 +++++++++++ .../main/java/com/hxhq/business/domain/StudySubject.java | 11 +++++++++++ .../java/com/hxhq/business/domain/StudySubjectUser.java | 10 ++++++++++ .../com/hxhq/business/service/impl/StudyServiceImpl.java | 10 +++++++--- .../hxhq/business/service/impl/StudySubjectServiceImpl.java | 10 ++++++++-- .../business/service/impl/StudySubjectUserServiceImpl.java | 13 ++++++++++--- 6 files changed, 57 insertions(+), 8 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java index ac43153..dddcdff 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Study.java @@ -33,6 +33,9 @@ public class Study extends MpBaseEntity /** 负责人姓名 */ private String leaderName; + /** 负责人姓名-英文 */ + private String leaderNameEn; + /** 试验状态1草稿，3试验中，5已锁定，7待归档，9归档，10待结档 */ private Integer status; @@ -100,6 +103,14 @@ public class Study extends MpBaseEntity this.leaderName = leaderName; } + public String getLeaderNameEn() { + return leaderNameEn; + } + + public void setLeaderNameEn(String leaderNameEn) { + this.leaderNameEn = leaderNameEn; + } + public void setStatus(Integer status) { this.status = status; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubject.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubject.java index 1377c10..94f3fd1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubject.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubject.java @@ -33,6 +33,9 @@ public class StudySubject extends MpBaseEntity /** 负责人姓名 */ private String leaderName; + /** 负责人姓名-英文 */ + private String leaderNameEn; + /** * 是否选中 */ @@ -96,6 +99,14 @@ public class StudySubject extends MpBaseEntity return leaderName; } + public String getLeaderNameEn() { + return leaderNameEn; + } + + public void setLeaderNameEn(String leaderNameEn) { + this.leaderNameEn = leaderNameEn; + } + public Boolean getSelect() { return select; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubjectUser.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubjectUser.java index ae399bb..31174ea 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubjectUser.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudySubjectUser.java @@ -27,6 +27,9 @@ public class StudySubjectUser extends MpBaseEntity /** 用户姓名 */ private String userName; + /** 用户姓名-英文 */ + private String userNameEn; + public Long getStudyId() { return studyId; } @@ -65,4 +68,11 @@ public class StudySubjectUser extends MpBaseEntity return userName; } + public String getUserNameEn() { + return userNameEn; + } + + public void setUserNameEn(String userNameEn) { + this.userNameEn = userNameEn; + } } 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 3d5be30..fcf8775 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 @@ -211,9 +211,13 @@ public class StudyServiceImpl extends ServiceImpl implements }else{ //修改 Study old = getById(study.getId()); - if(!old.getStatus().equals(StudyStatusEnum.cg.getValue())){ + if(!old.getStatus().equals(StudyStatusEnum.cg.getValue()) && study.getStatus().equals(StudyStatusEnum.cg.getValue())){ throw new ServiceException("当前状态不允许暂存"); } + if(!old.getStatus().equals(StudyStatusEnum.cg.getValue()) && !old.getStatus().equals(StudyStatusEnum.syz.getValue())){ + throw new ServiceException("当前状态不允许修改"); + } + checkPermit(old); //获取修改的稽查轨迹 List jcgjList = getChangeJcgj(old,study,sign); @@ -223,9 +227,9 @@ public class StudyServiceImpl extends ServiceImpl implements Map formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("新增人员", study.getLeaderName()); - formDataEn.put("Add User", study.getLeaderName()); + formDataEn.put("Add User", study.getLeaderNameEn()); formData.put("删除人员", old.getLeaderName()); - formDataEn.put("Remove User", old.getLeaderName()); + formDataEn.put("Remove User", old.getLeaderNameEn()); 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())){ 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 d9c4240..86176fb 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 @@ -124,7 +124,9 @@ public class StudySubjectServiceImpl extends ServiceImpl modifyList = new ArrayList<>(); List addNameList = new ArrayList<>(); + List addNameEnList = new ArrayList<>(); List deleteNameList = new ArrayList<>(); + List deleteNameEnList = new ArrayList<>(); for(StudySubject item : itemList){ @@ -134,11 +136,14 @@ public class StudySubjectServiceImpl extends ServiceImplo.getDeptId().equals(old.getDeptId())).collect(Collectors.toList()).size()==0){ deleteList.add(old); deleteNameList.add(old.getLeaderName()); + deleteNameEnList.add(old.getLeaderNameEn()); } } @@ -177,11 +183,11 @@ public class StudySubjectServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join("，",addNameList)); - formDataEn.put("Add User", String.join("，",addNameList)); + formDataEn.put("Add User", String.join("，",addNameEnList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameList)); + formDataEn.put("Remove User", String.join("，",deleteNameEnList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); form.getSign().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":""); 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 9891f43..0f897f6 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 @@ -73,7 +73,9 @@ public class StudySubjectUserServiceImpl extends ServiceImpl modifyList = new ArrayList<>(); List addNameList = new ArrayList<>(); + List addNameEnList = new ArrayList<>(); List deleteNameList = new ArrayList<>(); + List deleteNameEnList = new ArrayList<>(); for(StudySubjectUser item : itemList){ List existsList = oldList.stream().filter(o->o.getUserId().equals(item.getUserId())).collect(Collectors.toList()); @@ -83,13 +85,16 @@ public class StudySubjectUserServiceImpl extends ServiceImplo.getUserId().equals(old.getUserId())).collect(Collectors.toList()).size()==0){ deleteList.add(old); deleteNameList.add(old.getUserName()); + deleteNameEnList.add(old.getUserNameEn()); } } if(addList.size()>0){ @@ -115,11 +121,11 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join("，",addNameList)); - formDataEn.put("Add User", String.join("，",addNameList)); + formDataEn.put("Add User", String.join("，",addNameEnList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameList)); + formDataEn.put("Remove User", String.join("，",deleteNameEnList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); form.getSign().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":""); @@ -134,11 +140,12 @@ public class StudySubjectUserServiceImpl extends ServiceImpl userList = list(queryWrapper); if(userList.size()>0){ List deleteNameList = userList.stream().map(o->o.getUserName()).collect(Collectors.toList()); + List deleteNameEnList = userList.stream().map(o->o.getUserNameEn()).collect(Collectors.toList()); if(deleteNameList.size()>0){ Map formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameList)); + formDataEn.put("Remove User", String.join("，",deleteNameEnList)); 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":"");