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

法规清单（切换用户下拉按钮时，添加上工程接口人和責任人）

Browse Source
This commit is contained in:
cuijiaming
2023-03-09 11:56:14 +08:00
parent 73d551bc6d
commit a401b99378
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java
+3
View File
@@ -14,6 +14,9 @@ public enum ProjectRoleEnum {
ADMIN("系统管理员","12","admin"), ADMIN("系统管理员","12","admin"),
VIEWER("Viewer","13","Viewer"), VIEWER("Viewer","13","Viewer"),
BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"), BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"),
//法规清单使用
INTERFACE_PERSON1("工程接口人","15","Interface person"),
PERSON_LIABLE1("责任人","16","Person liable"),
// 项目库-认证清单使用。 // 项目库-认证清单使用。
INTERFACE_PERSON("接口人","20","Interface person"), INTERFACE_PERSON("接口人","20","Interface person"),
PERSON_LIABLE("责任人","21","Person liable"), PERSON_LIABLE("责任人","21","Person liable"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+38
View File
@@ -9406,6 +9406,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
sysRoles.add(sysRole); 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(" ","");
certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
}
}
}
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
|| 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())) // if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
// || lawEngineerNameList.contains(loginUser.getUsername())){ // || lawEngineerNameList.contains(loginUser.getUsername())){
// SysRole sysRole = new SysRole(); // SysRole sysRole = new SysRole();
@@ -9419,6 +9442,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
// //
// } // }
// 责任人
QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId,loginUser.getId());
Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
if(dutyPersonCount > 0){
SysRole sysRole = new SysRole();
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getName());
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getCode());
}
sysRoles.add(sysRole);
}