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

UAT 问题清单-27行修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-06 15:12:32 +08:00
parent 82c41ded1c
commit 27287ed1f9
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+37 -4
View File
@@ -10618,7 +10618,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
//相关人员名单中取法规工程师 //相关人员名单中取法规工程师
List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null); /*List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
List<String> lawEngineerNameList = new ArrayList<>(); List<String> lawEngineerNameList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){ if(projectRelatedPersonnels.size() != 0){
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
@@ -10638,7 +10638,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
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<>(); /*List<String> certificationEngineerList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){ if(projectRelatedPersonnels.size() != 0){
for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
@@ -10661,7 +10661,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
sysRoles.add(sysRole); sysRoles.add(sysRole);
}*/ }*/
List<String> engineeringInterfacePersonList = new ArrayList<>(); /*List<String> engineeringInterfacePersonList = new ArrayList<>();
if(projectRelatedPersonnels.size() != 0){ if(projectRelatedPersonnels.size() != 0){
for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName(); String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
@@ -10680,7 +10680,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode()); sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
} }
sysRoles.add(sysRole); 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())){
@@ -10695,6 +10695,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
// //
// } // }
// 法规工程师
QueryWrapper<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>();
querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,loginUser.getId());
Integer lawCount = this.baseMapper.selectCount(querylawEngineerCountWrap);
if(lawCount > 0){
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);
}
// 工程接口人
QueryWrapper<ProjectLawsInventoryEO> queryEipCountWrap = new QueryWrapper<>();
queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson,loginUser.getId());
Integer eipCount = this.baseMapper.selectCount(queryEipCountWrap);
if(eipCount > 0){
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);
}
// 责任人 // 责任人
QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);