修改认证清单修改进度问题
This commit is contained in:
+22
-21
@@ -389,27 +389,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
|
for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
|
||||||
if(allList.size()>0){
|
if(allList.size()>0){
|
||||||
if(!allList.contains(dutyPerson)){
|
if(!allList.contains(dutyPerson)){
|
||||||
|
if (StringUtils.isNotEmpty(roleCode)) {
|
||||||
if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
|
if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
|
||||||
if(relatedPersonnel.getEngineeringInterfacePerson() != null){
|
if(relatedPersonnel.getEngineeringInterfacePerson() != null){
|
||||||
String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
|
String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
|
||||||
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
|
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
|
||||||
}else {
|
}else {
|
||||||
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
|
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
|
||||||
}
|
}
|
||||||
}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
|
}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
|
||||||
if(relatedPersonnel.getEngineerLawSet() != null){
|
if(relatedPersonnel.getEngineerLawSet() != null){
|
||||||
String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
|
String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
|
||||||
relatedPersonnel.setEngineerLawSet(engineerLawSet);
|
relatedPersonnel.setEngineerLawSet(engineerLawSet);
|
||||||
}else {
|
}else {
|
||||||
relatedPersonnel.setEngineerLawSet(dutyPerson);
|
relatedPersonnel.setEngineerLawSet(dutyPerson);
|
||||||
}
|
}
|
||||||
}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
|
}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
|
||||||
if(relatedPersonnel.getEngineerAttSet() !=null){
|
if(relatedPersonnel.getEngineerAttSet() !=null){
|
||||||
String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
|
String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
|
||||||
relatedPersonnel.setEngineerAttSet(engineerAttSet);
|
relatedPersonnel.setEngineerAttSet(engineerAttSet);
|
||||||
}else {
|
}else {
|
||||||
relatedPersonnel.setEngineerAttSet(dutyPerson);
|
relatedPersonnel.setEngineerAttSet(dutyPerson);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user