feat: [试验管理] 稽查轨迹双语

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

@@ -227,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.getLeaderNameEn());
+                formDataEn.put("Add Person", study.getLeaderNameEn());
                 formData.put("删除人员", old.getLeaderName());
-                formDataEn.put("Remove User", old.getLeaderNameEn());
+                formDataEn.put("Remove Person", 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())){
@@ -442,9 +442,26 @@ public class StudyServiceImpl extends ServiceImpl implements
     }
 
     private void checkPermit(Study study){
-        String tfmRole = "TFM";
-        if(!AuthUtil.hasRole(tfmRole) && !study.getLeader().equals(SecurityUtils.getUserId())){
-            throw new ServiceException("没有该试验操作权限");
+        if(study.getType().equals(StudyTypeEnum.sy.getValue())){
+            //TFM和所属人可以操作
+            String tfmRole = "TFM";
+            if(!AuthUtil.hasRole(tfmRole) && !study.getLeader().equals(SecurityUtils.getUserId())){
+                throw new ServiceException("没有该试验操作权限");
+            }
+        }
+        if(study.getType().equals(StudyTypeEnum.fsy.getValue())){
+            //部长和所属人可以操作
+            String bz = "bz";
+            if(!AuthUtil.hasRole(bz) && !study.getLeader().equals(SecurityUtils.getUserId())){
+                throw new ServiceException("没有该非试验表单操作权限");
+            }
+        }
+        if(study.getType().equals(StudyTypeEnum.mjy.getValue())){
+            //部长和所属人可以操作
+            String bz = "bz";
+            if(!AuthUtil.hasRole(bz) && !study.getLeader().equals(SecurityUtils.getUserId())){
+                throw new ServiceException("没有该麻精药表单操作权限");
+            }
         }
     }
 }

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

@@ -184,11 +184,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("，",addNameEnList));
+                formDataEn.put("Add Person", String.join("，",addNameEnList));
             }
             if(deleteNameList.size()>0){
                 formData.put("删除人员", String.join("，",deleteNameList));
-                formDataEn.put("Remove User", String.join("，",deleteNameEnList));
+                formDataEn.put("Remove Person", 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

@@ -121,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("，",addNameEnList));
+                formDataEn.put("Add Person", String.join("，",addNameEnList));
             }
             if(deleteNameList.size()>0){
                 formData.put("删除人员", String.join("，",deleteNameList));
-                formDataEn.put("Remove User", String.join("，",deleteNameEnList));
+                formDataEn.put("Remove Person", 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":"");
@@ -145,7 +145,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
                 Map<String, String> formData = new LinkedHashMap<>();
                 Map<String, String> formDataEn = new LinkedHashMap<>();
                 formData.put("删除人员", String.join("，",deleteNameList));
-                formDataEn.put("Remove User", String.join("，",deleteNameEnList));
+                formDataEn.put("Remove Person", 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":"");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java

@@ -347,7 +347,7 @@ public class ObjectCompareUtil {
 
         public String toEnString(){
             Map<String, String> map = new LinkedHashMap<>();
-            map.put("Field Name", fieldLabelEn);
+            map.put("Field", fieldLabelEn);
             map.put("Old Value", oldValue);
             map.put("New Value", newValue);
             return JctUtil.formatStr(map);