feat: [试验管理] 稽查轨迹修改

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;

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

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

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<StudyJcgj> jcgjList = getChangeJcgj(old,study,sign);
@@ -223,9 +227,9 @@ public class StudyServiceImpl extends ServiceImpl implements
                 Map<String, String> formData = new LinkedHashMap<>();
                 Map<String, String> 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())){

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

@@ -124,7 +124,9 @@ public class StudySubjectServiceImpl extends ServiceImpl
         List<StudySubject> modifyList = new ArrayList<>();
 
         List<String> addNameList = new ArrayList<>();
+        List<String> addNameEnList = new ArrayList<>();
         List<String> deleteNameList = new ArrayList<>();
+        List<String> deleteNameEnList = new ArrayList<>();
 
 
         for(StudySubject item : itemList){
@@ -134,11 +136,14 @@ public class StudySubjectServiceImpl extends ServiceImpl
                 addList.add(item);
 
                 addNameList.add(item.getLeaderName());
+                addNameEnList.add(item.getLeaderNameEn());
             }else{
                 modifyList.add(item);
                 if(!exists.get(0).getLeaderName().equals(item.getLeaderName())){
                     addNameList.add(item.getLeaderName());
+                    addNameEnList.add(item.getLeaderNameEn());
                     deleteNameList.add(exists.get(0).getLeaderName());
+                    deleteNameEnList.add(exists.get(0).getLeaderNameEn());
                 }
             }
         }
@@ -147,6 +152,7 @@ public class StudySubjectServiceImpl extends ServiceImpl
             if(itemList.stream().filter(o->o.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
             Map<String, String> 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":"");

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

@@ -73,7 +73,9 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
         List<StudySubjectUser> modifyList = new ArrayList<>();
 
         List<String> addNameList = new ArrayList<>();
+        List<String> addNameEnList = new ArrayList<>();
         List<String> deleteNameList = new ArrayList<>();
+        List<String> deleteNameEnList = new ArrayList<>();
 
         for(StudySubjectUser item : itemList){
             List<StudySubjectUser> existsList = oldList.stream().filter(o->o.getUserId().equals(item.getUserId())).collect(Collectors.toList());
@@ -83,13 +85,16 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
                 addList.add(item);
 
                 addNameList.add(item.getUserName());
+                addNameEnList.add(item.getUserNameEn());
             }else{
                 item.setId(existsList.get(0).getId());
                 modifyList.add(item);
 
                 if(!existsList.get(0).getUserName().equals(item.getUserName())){
                     addNameList.add(item.getUserName());
+                    addNameEnList.add(item.getUserNameEn());
                     deleteNameList.add(existsList.get(0).getUserName());
+                    deleteNameEnList.add(existsList.get(0).getUserNameEn());
                 }
             }
         }
@@ -98,6 +103,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
             if(itemList.stream().filter(o->o.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
             Map<String, String> 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
         List<StudySubjectUser> userList = list(queryWrapper);
         if(userList.size()>0){
             List<String> deleteNameList = userList.stream().map(o->o.getUserName()).collect(Collectors.toList());
+            List<String> deleteNameEnList = userList.stream().map(o->o.getUserNameEn()).collect(Collectors.toList());
             if(deleteNameList.size()>0){
                 Map<String, String> formData = new LinkedHashMap<>();
                 Map<String, String> 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":"");