From 189f45749696ecbbf41705ca8ac3d96452446072 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 14 Sep 2023 15:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=88=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 130 ++++++------------ 1 file changed, 43 insertions(+), 87 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 3ddd759b8..b3c422c46 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -1694,93 +1694,51 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI 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(); - // studio - if(StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.STUDIO_ENGINEER.getCode()); - } + List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null); - sysRoles.add(sysRole); + + //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())) { + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName()); + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { + sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode()); } + sysRoles.add(sysRole); + } - // 认证 - if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); - } - sysRoles.add(sysRole); + // 接口人 + QueryWrapper querySdtCountWrap = new QueryWrapper<>(); + querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt, loginUser.getId()); + querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId); + Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap); + if (sdtCount > 0) { + SysRole sysRole = new SysRole(); + sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue()); + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName()); + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { + sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode()); } + sysRoles.add(sysRole); + } - // 法规 - //相关人员名单中取法规工程师 - List projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,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())){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.REGULATI_ENGINEER.getCode()); - } - sysRoles.add(sysRole); - } - } - - // 接口人 - QueryWrapper querySdtCountWrap = new QueryWrapper<>(); - querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId()); - querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); - Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap); - if(sdtCount > 0){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode()); - } - sysRoles.add(sysRole); - } - - // 责任人 - QueryWrapper queryDutyPersonCountWrap = new QueryWrapper<>(); - queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId()); - queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); - Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); - if(dutyPersonCount > 0){ - SysRole sysRole = new SysRole(); - sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode()); - } - sysRoles.add(sysRole); + // 责任人 + QueryWrapper queryDutyPersonCountWrap = new QueryWrapper<>(); + queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson, loginUser.getId()); + queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId); + Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); + if (dutyPersonCount > 0) { + SysRole sysRole = new SysRole(); + sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue()); + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName()); + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { + sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode()); } + sysRoles.add(sysRole); } // 领导、系统管理员、Viewer、品牌管理员 处理 @@ -1790,7 +1748,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI List admin = roleList.stream().filter(e -> ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List Viewer = roleList.stream().filter(e -> ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List brandAdministrator = roleList.stream().filter(e -> ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { if (manager.size() != 0) { manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue()); sysRoles.addAll(manager); @@ -1807,7 +1765,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue()); sysRoles.addAll(brandAdministrator); } - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { if (manager.size() != 0) { manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue()); manager.get(0).setRoleName(ProjectRoleEnum.MANAGER.getCode()); @@ -1828,14 +1786,12 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode()); sysRoles.addAll(brandAdministrator); } - } - } - if(sysRoles==null||sysRoles.size()<=0) { + if (sysRoles == null || sysRoles.size() <= 0) { result.error500("未找到角色信息"); - }else { + } else { result.setResult(sysRoles); result.setSuccess(true); }