WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台件-认证清单（角色切换）

Browse Source
This commit is contained in:
zhn
2023-09-14 15:19:58 +08:00
parent f6070c2835
commit 189f457496
1 changed files with 43 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+5 -49
View File
@@ -1694,62 +1694,21 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
List<SysRole> sysRoles = new LinkedList<>(); List<SysRole> sysRoles = new LinkedList<>();
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//项目详情中取R&H Studio和认证工程师
List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null); List<ProjectLibraryBase> 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());
}
sysRoles.add(sysRole);
}
// 认证 //1、判断当前登录用户是否为该平台件项目的的法规工程师
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))){ if(!projectLibraryBases.isEmpty() && loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){
SysRole sysRole = new SysRole(); SysRole sysRole = new SysRole();
sysRole.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); 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(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); 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(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
} }
sysRoles.add(sysRole); sysRoles.add(sysRole);
} }
// 法规
//相关人员名单中取法规工程师
List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null);
List<String> 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<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt, loginUser.getId()); querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt, loginUser.getId());
@@ -1781,7 +1740,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
} }
sysRoles.add(sysRole); sysRoles.add(sysRole);
} }
}
// 领导、系统管理员、Viewer、品牌管理员 处理 // 领导、系统管理员、Viewer、品牌管理员 处理
List<SysRole> roleList = this.sysRoleMapper.getRoleByUserId(loginUser.getId()); List<SysRole> roleList = this.sysRoleMapper.getRoleByUserId(loginUser.getId());
@@ -1828,9 +1786,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode()); brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode());
sysRoles.addAll(brandAdministrator); sysRoles.addAll(brandAdministrator);
} }
} }
} }
if (sysRoles == null || sysRoles.size() <= 0) { if (sysRoles == null || sysRoles.size() <= 0) {