From eee6db760dbc6354709ea30253bd1d2d7c8f4138 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 1 Jul 2022 19:16:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=A7=92=E8=89=B2=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/ProjectRoleEnum.java | 2 +- .../ProjectLawsInventoryEOController.java | 4 +- .../project/enums/ProjectRoleEnum.java | 49 +++++++++++++------ .../IProjectLawsInventoryEOService.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 42 ++++++++++++---- 5 files changed, 69 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index e34041afb..8f4b0c151 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -7,7 +7,7 @@ public enum ProjectRoleEnum { STUDIO_ENGINEER("studio工程师","0","R&H Studio"), REGULATI_ENGINEER("法规工程师","1","studio"), HOMOLOGATION_ENGINEER("认证工程师","2","homo"), - REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4",""), + REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4","Regulatory Engineer/Certification Engineer"), MANAGER("领导角色","11","R&H Manager"), ADMIN("系统管理员","12","admin"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index e6344e7f8..704c077f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -443,9 +443,9 @@ public class ProjectLawsInventoryEOController extends JeroController> getRoleByUserId(String projectLibraryId) { + public Result> getRoleByUserId(String projectLibraryId,String cut) { Result> result = new Result<>(); - List list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId); + List list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut); if(list==null||list.size()<=0) { result.error500("未找到角色信息"); }else { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java index 4f6ee04d2..e51aac31f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java @@ -1,30 +1,35 @@ package com.jero.modules.project.enums; +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.system.util.StringUtils; + /** * 项目角色枚举类 */ public enum ProjectRoleEnum { - STUDIO_ENGINEER("studio工程师","0"), - REGULATI_ENGINEER("法规工程师","1"), - HOMOLOGATION_ENGINEER("认证工程师","2"), - ENGINEERING_INTERFACE_PERSON("工程接口人","3"), - REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4"), - DESIGNINITIATOR("设计符合性确认-发起人","5"), - DESIGNDUTY("设计符合性确认-责任人","6"), - PREHOMOINITIATOR("prehomo确认-发起人","7"), - PREHOMODUTY("prehomo确认-责任人","8"), - VERIFYINITIATOR("验证符合性确认-发起人","9"), - VERIFYDUTY("验证符合性确认-责任人","10"), - MANAGER("验证符合性确认-责任人","11"), - ADMIN("系统管理员","12"), + STUDIO_ENGINEER("studio工程师","0","R&H Studio"), + REGULATI_ENGINEER("法规工程师","1","Regulatory Engineer"), + HOMOLOGATION_ENGINEER("认证工程师","2","Certification Engineer"), + ENGINEERING_INTERFACE_PERSON("工程接口人","3","Engineering interface person"), + REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4","Regulatory and certification engineer"), + DESIGNINITIATOR("设计符合性确认-发起人","5",""), + DESIGNDUTY("设计符合性确认-责任人","6",""), + PREHOMOINITIATOR("prehomo确认-发起人","7",""), + PREHOMODUTY("prehomo确认-责任人","8",""), + VERIFYINITIATOR("验证符合性确认-发起人","9",""), + VERIFYDUTY("验证符合性确认-责任人","10",""), + MANAGER("验证符合性确认-责任人","11",""), + ADMIN("系统管理员","12",""), ; String name; String value; + String enName; - private ProjectRoleEnum(String name, String value) { + private ProjectRoleEnum(String name, String value,String enName) { this.name = name; this.value = value; + this.enName = enName; } public String getName() { @@ -43,11 +48,23 @@ public enum ProjectRoleEnum { this.value = value; } - public static String getTextByValue(String value) { + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static String getTextByValue(String value,String cut) { ProjectRoleEnum[] values = values(); for (ProjectRoleEnum projectRoleEnum : values) { if (projectRoleEnum.value.equals(value)) { - return projectRoleEnum.name; + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return projectRoleEnum.name; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return projectRoleEnum.enName; + } } } return null; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 61e4e02af..5d5161245 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -148,5 +148,5 @@ public interface IProjectLawsInventoryEOService extends IService expediting(JSONObject json); - List getRoleByUserId(String projectLibraryId); + List getRoleByUserId(String projectLibraryId,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d59bc2c96..e893bab9d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -6293,7 +6293,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getRoleByUserId(String projectLibraryId) { + public List getRoleByUserId(String projectLibraryId,String cut) { List sysRoles = new LinkedList<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //项目详情中取R&H Studio和认证工程师 @@ -6305,7 +6305,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl manager = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List admin = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); - if (manager.size() != 0) { - manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue()); - sysRoles.addAll(manager); - } - if (admin.size() != 0) { - admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue()); - sysRoles.addAll(admin); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (manager.size() != 0) { + manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue()); + sysRoles.addAll(manager); + } + if (admin.size() != 0) { + admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue()); + sysRoles.addAll(admin); + } + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + if (manager.size() != 0) { + manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode()); + sysRoles.addAll(manager); + } + if (admin.size() != 0) { + admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode()); + admin.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode()); + sysRoles.addAll(admin); + } } + } return sysRoles; }