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

法规清单和认证清单 编辑/添加时，选择工程接口人 获取的是相关人员名单中的3列工程接口人

Browse Source
This commit is contained in:
cuijiaming
2023-04-03 11:03:02 +08:00
parent 874dafe516
commit 45c07abab3
1 changed files with 41 additions and 0 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/ProjectRelatedPersonnelServiceImpl.java
+41
View File
@@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
List<Map<String,Object>> lawEngineerList = new ArrayList<>(); List<Map<String,Object>> lawEngineerList = new ArrayList<>();
List<Map<String,Object>> certificationEngineerList = new ArrayList<>(); List<Map<String,Object>> certificationEngineerList = new ArrayList<>();
List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>(); List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>();
List<Map<String,Object>> studioPersonList = new ArrayList<>(); List<Map<String,Object>> studioPersonList = new ArrayList<>();
//项目的studio用户 //项目的studio用户
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
@@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
userIdList.add(engineeringInterfacePerson); userIdList.add(engineeringInterfacePerson);
} }
} }
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
for (String engineerLawSet : engineerLawSetArr) {
userIdList.add(engineerLawSet);
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
for (String engineerAttSet : engineerAttSetArr) {
userIdList.add(engineerAttSet);
}
}
} }
userIdList.add(studioEngineer); userIdList.add(studioEngineer);
List<SysUser> sysUserList = new ArrayList<>(); List<SysUser> sysUserList = new ArrayList<>();
@@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
} }
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
for (String engineerLawSet : engineerLawSetArr) {
for (SysUser sysUser : sysUserList) {
if(StringUtils.equals(engineerLawSet,sysUser.getId())){
Map<String,Object> map = new HashMap<>();
map.put("name",sysUser.getUsername());
map.put("value",sysUser.getId());
engineeringInterfacePersonList.add(map);
}
}
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
for (String engineerAttSet : engineerAttSetArr) {
for (SysUser sysUser : sysUserList) {
if(StringUtils.equals(engineerAttSet,sysUser.getId())){
Map<String,Object> map = new HashMap<>();
map.put("name",sysUser.getUsername());
map.put("value",sysUser.getId());
engineeringInterfacePersonList.add(map);
}
}
}
}
if (StringUtils.isNotBlank(studioEngineer)) { if (StringUtils.isNotBlank(studioEngineer)) {
for (SysUser sysUser : sysUserList) { for (SysUser sysUser : sysUserList) {
if (StringUtils.equals(studioEngineer, sysUser.getId())) { if (StringUtils.equals(studioEngineer, sysUser.getId())) {