diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 73e87b67e..d4090ef6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -103,6 +103,7 @@ import com.jero.modules.project.service.IProjectUserPermissionService; import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl; import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl; import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl; +import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl; import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl; import com.jero.modules.project.util.WordUtil; import com.jero.modules.project.vo.NcrTrackVO; @@ -313,6 +314,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl getRoleByUserId(String projectLibraryId, String cut) { List sysRoles = new LinkedList<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //项目详情中取R&H Studio和认证工程师 List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null); - String certificationEngineerName = ""; - if (projectLibraryBases.size() != 0) { - certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); - String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName(); - if (StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())) { - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - if (StringUtils.equals(cut, CutEnum.CN.getValue())) { - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getName()); - } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getCode()); - } - - sysRoles.add(sysRole); - } - - // 认证 - if ((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))) { - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); - if (StringUtils.equals(cut, CutEnum.CN.getValue())) { - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); - } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); - } - sysRoles.add(sysRole); - } - } - //相关人员名单中取法规工程师 - /*List projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null); - List lawEngineerNameList = new ArrayList<>(); - if(projectRelatedPersonnels.size() != 0){ - for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { - String lawEngineerName = projectRelatedPersonnel.getLawEngineerName(); - if(StringUtils.isNotBlank(lawEngineerName)){ - lawEngineerName = lawEngineerName.replaceAll(" ",""); - lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(","))); - } - } - } - if(lawEngineerNameList.contains(loginUser.getUsername())){ + //1、判断当前登录用户是否为该平台件项目的的法规工程师 + if(!projectLibraryBases.isEmpty() && loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){ SysRole sysRole = new SysRole(); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode()); } sysRoles.add(sysRole); - }*/ - /*List certificationEngineerList = new ArrayList<>(); - if(projectRelatedPersonnels.size() != 0){ - for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ - String certificationEngineerName1 = projectRelatedPersonnel.getCertificationEngineerName(); - if(StringUtils.isNotBlank(certificationEngineerName1)){ - certificationEngineerName1 = certificationEngineerName1.replaceAll(" ",""); - certificationEngineerList.addAll(Arrays.asList(certificationEngineerName1.split(","))); - } - } } - if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) - || certificationEngineerList.contains(loginUser.getUsername())){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); - } - sysRoles.add(sysRole); - }*/ - /*List engineeringInterfacePersonList = new ArrayList<>(); - if(projectRelatedPersonnels.size() != 0){ - for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ - String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName(); - if(StringUtils.isNotBlank(engineeringInterfacePerson)){ - engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ",""); - engineeringInterfacePersonList.addAll(Arrays.asList(engineeringInterfacePerson.split(","))); - } - } - } - if(engineeringInterfacePersonList.contains(loginUser.getUsername())){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode()); - } - sysRoles.add(sysRole); - }*/ - -// if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername())) -// || lawEngineerNameList.contains(loginUser.getUsername())){ -// SysRole sysRole = new SysRole(); -// sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); -// if(StringUtils.equals(cut,CutEnum.CN.getValue())){ -// sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName()); -// }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ -// sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getCode()); -// } -// sysRoles.add(sysRole); -// -// } + //遍历法规清单,判断是否为接口人或责任人 // 法规工程师 QueryWrapper querylawEngineerCountWrap = new QueryWrapper<>(); @@ -9797,7 +9707,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl