diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 971ccd0ff..11369517f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10618,7 +10618,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null); + /*List projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null); List lawEngineerNameList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { @@ -10638,7 +10638,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ @@ -10661,7 +10661,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl engineeringInterfacePersonList = new ArrayList<>(); + /*List engineeringInterfacePersonList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){ String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName(); @@ -10680,7 +10680,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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 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 queryDutyPersonCountWrap = new QueryWrapper<>(); queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);