项目库基础表,相关人员显示修改
This commit is contained in:
+5
-7
@@ -145,10 +145,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void disposeData(List<ProjectLibraryBase> records){
|
public void disposeData(List<ProjectLibraryBase> records) {
|
||||||
|
for (ProjectLibraryBase projectLibraryBase : records) {
|
||||||
|
|
||||||
for (ProjectLibraryBase projectLibraryBase:records) {
|
|
||||||
List<SysUser> sysUsers = new ArrayList<>();
|
List<SysUser> sysUsers = new ArrayList<>();
|
||||||
//认证工程师多个id查询
|
//认证工程师多个id查询
|
||||||
if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
|
if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
|
||||||
@@ -163,20 +161,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
if (CollectionUtils.isNotEmpty(sysUsers)) {
|
if (CollectionUtils.isNotEmpty(sysUsers)) {
|
||||||
String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
|
String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
|
||||||
String certificationEngineerName = null;
|
String certificationEngineerName = null;
|
||||||
|
StringBuilder certificationName = new StringBuilder();
|
||||||
|
|
||||||
for (String data : certificationEngineerIdList) {
|
for (String data : certificationEngineerIdList) {
|
||||||
if (StringUtils.isNotEmpty(certificationEngineerId)) {
|
if (StringUtils.isNotEmpty(certificationEngineerId)) {
|
||||||
certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
|
certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
|
||||||
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
certificationName.append(certificationEngineerName).append(" ");
|
||||||
}
|
}
|
||||||
projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
|
projectLibraryBase.setCertificationEngineerName(certificationName.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+9
-5
@@ -157,14 +157,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
|||||||
if(CollectionUtils.isNotEmpty(lawEngineerUsers)) {
|
if(CollectionUtils.isNotEmpty(lawEngineerUsers)) {
|
||||||
String lawEngineerId = projectRelatedPersonnel.getLawEngineer();
|
String lawEngineerId = projectRelatedPersonnel.getLawEngineer();
|
||||||
String lawEngineerName = null;
|
String lawEngineerName = null;
|
||||||
|
StringBuilder lawName = new StringBuilder();
|
||||||
for (String data : lawEngineerIdList) {
|
for (String data : lawEngineerIdList) {
|
||||||
if (StringUtils.isNotEmpty(lawEngineerId)) {
|
if (StringUtils.isNotEmpty(lawEngineerId)) {
|
||||||
lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
|
lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
|
||||||
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
||||||
}
|
}
|
||||||
|
lawName.append(lawEngineerName).append(" ");
|
||||||
}
|
}
|
||||||
projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
|
projectRelatedPersonnel.setLawEngineerName(lawName.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,14 +182,16 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
|||||||
if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) {
|
if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) {
|
||||||
String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson();
|
String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson();
|
||||||
String engineeringInterfacePersonName = null;
|
String engineeringInterfacePersonName = null;
|
||||||
|
StringBuilder engineeringName = new StringBuilder();
|
||||||
|
|
||||||
for (String data : engineeringInterfacePersonIdList) {
|
for (String data : engineeringInterfacePersonIdList) {
|
||||||
if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) {
|
if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) {
|
||||||
engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
|
engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
|
||||||
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
||||||
}
|
}
|
||||||
|
engineeringName.append(engineeringInterfacePersonName).append(" ");
|
||||||
}
|
}
|
||||||
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
|
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,14 +208,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
|||||||
if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) {
|
if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) {
|
||||||
String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer();
|
String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer();
|
||||||
String certificationEngineerName = null;
|
String certificationEngineerName = null;
|
||||||
|
StringBuilder certificationName = new StringBuilder();
|
||||||
for (String data : certificationEngineerIdList) {
|
for (String data : certificationEngineerIdList) {
|
||||||
if (StringUtils.isNotEmpty(certificationEngineerId)) {
|
if (StringUtils.isNotEmpty(certificationEngineerId)) {
|
||||||
certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
|
certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
|
||||||
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
|
||||||
}
|
}
|
||||||
|
certificationName.append(certificationEngineerName).append(" ");
|
||||||
}
|
}
|
||||||
projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
|
projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user