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

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-14 15:38:38 +08:00
parent bf86579ccc 189f457496
commit d1e62726b0
2 changed files with 51 additions and 186 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
+43 -87
View File
@@ -1694,93 +1694,51 @@ 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(!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()))){ QueryWrapper<ProjectCertificationInventoryEO> querySdtCountWrap = new QueryWrapper<>();
SysRole sysRole = new SysRole(); querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt, loginUser.getId());
sysRole.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap);
sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getName()); if (sdtCount > 0) {
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ SysRole sysRole = new SysRole();
sysRole.setRoleName(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getCode()); sysRole.setRoleCode(ProjectRoleEnum.INTERFACE_PERSON.getValue());
} if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
sysRoles.add(sysRole); sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getName());
} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
sysRole.setRoleName(ProjectRoleEnum.INTERFACE_PERSON.getCode());
} }
sysRoles.add(sysRole);
}
// 法规 // 责任人
//相关人员名单中取法规工程师 QueryWrapper<ProjectCertificationInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null); queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson, loginUser.getId());
List<String> lawEngineerNameList = new ArrayList<>(); queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
if(projectRelatedPersonnels.size() != 0){ Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { if (dutyPersonCount > 0) {
String lawEngineerName = projectRelatedPersonnel.getLawEngineerName(); SysRole sysRole = new SysRole();
if(StringUtils.isNotBlank(lawEngineerName)){ sysRole.setRoleCode(ProjectRoleEnum.PERSON_LIABLE.getValue());
lawEngineerName = lawEngineerName.replaceAll(" ",""); if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(","))); sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getName());
} } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
} sysRole.setRoleName(ProjectRoleEnum.PERSON_LIABLE.getCode());
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<>();
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<ProjectCertificationInventoryEO> 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);
} }
sysRoles.add(sysRole);
} }
// 领导、系统管理员、Viewer、品牌管理员 处理 // 领导、系统管理员、Viewer、品牌管理员 处理
@@ -1790,7 +1748,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
List<SysRole> admin = roleList.stream().filter(e -> ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List<SysRole> admin = roleList.stream().filter(e -> ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
List<SysRole> Viewer = roleList.stream().filter(e -> ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List<SysRole> Viewer = roleList.stream().filter(e -> ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
List<SysRole> brandAdministrator = roleList.stream().filter(e -> ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List<SysRole> 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) { if (manager.size() != 0) {
manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue()); manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
sysRoles.addAll(manager); sysRoles.addAll(manager);
@@ -1807,7 +1765,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue()); brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue());
sysRoles.addAll(brandAdministrator); sysRoles.addAll(brandAdministrator);
} }
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
if (manager.size() != 0) { if (manager.size() != 0) {
manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue()); manager.get(0).setRoleCode(ProjectRoleEnum.MANAGER.getValue());
manager.get(0).setRoleName(ProjectRoleEnum.MANAGER.getCode()); manager.get(0).setRoleName(ProjectRoleEnum.MANAGER.getCode());
@@ -1828,14 +1786,12 @@ 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) {
result.error500("未找到角色信息"); result.error500("未找到角色信息");
}else { } else {
result.setResult(sysRoles); result.setResult(sysRoles);
result.setSuccess(true); result.setSuccess(true);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+8 -99
View File
@@ -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.editImpl.ProjectLawsInventoryEOEditServiceImpl;
import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl; import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl; 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.service.impl.ProjectRelatedPersonnelServiceImpl;
import com.jero.modules.project.util.WordUtil; import com.jero.modules.project.util.WordUtil;
import com.jero.modules.project.vo.NcrTrackVO; import com.jero.modules.project.vo.NcrTrackVO;
@@ -313,6 +314,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
@Autowired @Autowired
private PlatformProjectLibraryBaseServiceImpl platformProjectLibraryBaseService; private PlatformProjectLibraryBaseServiceImpl platformProjectLibraryBaseService;
@Autowired @Autowired
private ProjectLibraryBaseServiceImpl projectLibraryBaseService;
@Autowired
private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService; private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
@Autowired @Autowired
@@ -8713,113 +8716,20 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
public List<SysRole> getRoleByUserId(String projectLibraryId, String cut) { public List<SysRole> getRoleByUserId(String projectLibraryId, String cut) {
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 = ""; //1、判断当前登录用户是否为该平台件项目的的法规工程师
if (projectLibraryBases.size() != 0) { if(!projectLibraryBases.isEmpty() && loginUser.getUsername().equals(projectLibraryBases.get(0).getCreateBy())){
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<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,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 sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_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(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_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(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode()); sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
} }
sysRoles.add(sysRole); sysRoles.add(sysRole);
}*/
/*List<String> 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<String> 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<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>();
@@ -9797,7 +9707,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
* @param projectLawsInventoryEO * @param projectLawsInventoryEO
* @param errorMsg * @param errorMsg
* @param msgList * @param msgList
* @param regulationOwnerId
* @param sysUserList * @param sysUserList
* @param nameCn * @param nameCn
* @param nameEn * @param nameEn